Added configure check for sys/reg.h.
diff --git a/configure b/configure index 264c40c..c0dd6fb 100755 --- a/configure +++ b/configure
@@ -5180,6 +5180,7 @@ sys/mount.h \ sys/msg.h \ sys/param.h \ + sys/reg.h \ sys/signal.h \ sys/shm.h \ sys/socket.h \ @@ -5199,17 +5200,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5203: checking for $ac_hdr" >&5 +echo "configure:5204: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5208 "configure" +#line 5209 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5236,12 +5237,12 @@ done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:5240: checking whether stat file-mode macros are broken" >&5 +echo "configure:5241: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5245 "configure" +#line 5246 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5294,12 +5295,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5298: checking for working const" >&5 +echo "configure:5299: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5303 "configure" +#line 5304 "configure" #include "confdefs.h" int main() { @@ -5348,7 +5349,7 @@ ; return 0; } EOF -if { (eval echo configure:5352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5369,21 +5370,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5373: checking for inline" >&5 +echo "configure:5374: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5380 "configure" +#line 5381 "configure" #include "confdefs.h" int main() { } int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5409,12 +5410,12 @@ esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5413: checking for ANSI C header files" >&5 +echo "configure:5414: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5418 "configure" +#line 5419 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5422,7 +5423,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5439,7 +5440,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5443 "configure" +#line 5444 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5457,7 +5458,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5461 "configure" +#line 5462 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5478,7 +5479,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 5482 "configure" +#line 5483 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5489,7 +5490,7 @@ exit (0); } EOF -if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5513,12 +5514,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5517: checking for size_t" >&5 +echo "configure:5518: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5522 "configure" +#line 5523 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5546,7 +5547,7 @@ fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:5550: checking size of long long" >&5 +echo "configure:5551: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5554,7 +5555,7 @@ ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <<EOF -#line 5558 "configure" +#line 5559 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -5565,7 +5566,7 @@ exit(0); } EOF -if { (eval echo configure:5569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -5588,12 +5589,12 @@ if test "$ac_cv_header_linux_joystick_h" = "yes" then echo $ac_n "checking "whether linux/joystick.h uses the Linux 2.2+ API"""... $ac_c" 1>&6 -echo "configure:5592: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:5593: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5597 "configure" +#line 5598 "configure" #include "confdefs.h" #include <sys/ioctl.h> @@ -5608,7 +5609,7 @@ /*empty*/ ; return 0; } EOF -if { (eval echo configure:5612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -5635,12 +5636,12 @@ if test "$ac_cv_header_sys_vfs_h" = "yes" then echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5639: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:5640: checking "whether sys/vfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5644 "configure" +#line 5645 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5657,7 +5658,7 @@ ; return 0; } EOF -if { (eval echo configure:5661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -5684,12 +5685,12 @@ if test "$ac_cv_header_sys_statfs_h" = "yes" then echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5688: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:5689: checking "whether sys/statfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5693 "configure" +#line 5694 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5704,7 +5705,7 @@ ; return 0; } EOF -if { (eval echo configure:5708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -5731,12 +5732,12 @@ if test "$ac_cv_header_sys_mount_h" = "yes" then echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5735: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:5736: checking "whether sys/mount.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5740 "configure" +#line 5741 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5751,7 +5752,7 @@ ; return 0; } EOF -if { (eval echo configure:5755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -5777,7 +5778,7 @@ echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:5781: checking "for statfs.f_bfree"" >&5 +echo "configure:5782: checking "for statfs.f_bfree"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5786,7 +5787,7 @@ wine_cv_statfs_bfree=no else cat > conftest.$ac_ext <<EOF -#line 5790 "configure" +#line 5791 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5813,7 +5814,7 @@ ; return 0; } EOF -if { (eval echo configure:5817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -5837,7 +5838,7 @@ fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:5841: checking "for statfs.f_bavail"" >&5 +echo "configure:5842: checking "for statfs.f_bavail"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5846,7 +5847,7 @@ wine_cv_statfs_bavail=no else cat > conftest.$ac_ext <<EOF -#line 5850 "configure" +#line 5851 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5873,7 +5874,7 @@ ; return 0; } EOF -if { (eval echo configure:5877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -5898,7 +5899,7 @@ echo $ac_n "checking "for working sigaltstack"""... $ac_c" 1>&6 -echo "configure:5902: checking "for working sigaltstack"" >&5 +echo "configure:5903: checking "for working sigaltstack"" >&5 if eval "test \"`echo '$''{'ac_cv_c_working_sigaltstack'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5907,7 +5908,7 @@ else cat > conftest.$ac_ext <<EOF -#line 5911 "configure" +#line 5912 "configure" #include "confdefs.h" #include <stdio.h> @@ -5945,7 +5946,7 @@ } EOF -if { (eval echo configure:5949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_working_sigaltstack="yes" else @@ -5972,12 +5973,12 @@ echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:5976: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:5977: checking "for msg_accrights in struct msghdr"" >&5 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5981 "configure" +#line 5982 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5985,7 +5986,7 @@ struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:5989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -6008,12 +6009,12 @@ echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:6012: checking "whether we need to define __i386__"" >&5 +echo "configure:6013: checking "whether we need to define __i386__"" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6017 "configure" +#line 6018 "configure" #include "confdefs.h" #if (defined(i386) || defined(__i386)) && !defined(__i386__) yes
diff --git a/configure.in b/configure.in index 9f6689b6..b374858 100644 --- a/configure.in +++ b/configure.in
@@ -660,6 +660,7 @@ sys/mount.h \ sys/msg.h \ sys/param.h \ + sys/reg.h \ sys/signal.h \ sys/shm.h \ sys/socket.h \
diff --git a/include/config.h.in b/include/config.h.in index 87a84a1..e74c0d5 100644 --- a/include/config.h.in +++ b/include/config.h.in
@@ -365,6 +365,9 @@ /* Define if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H +/* Define if you have the <sys/reg.h> header file. */ +#undef HAVE_SYS_REG_H + /* Define if you have the <sys/shm.h> header file. */ #undef HAVE_SYS_SHM_H
diff --git a/server/context_i386.c b/server/context_i386.c index 4479e32..c6a9eb4 100644 --- a/server/context_i386.c +++ b/server/context_i386.c
@@ -10,7 +10,9 @@ #include <assert.h> #include <errno.h> +#ifdef HAVE_SYS_REG_H #include <sys/reg.h> +#endif #include <sys/ptrace.h> #include <sys/user.h> #include <unistd.h>