ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not include sys/ptrace.h and sys/user.h unconditionally. 

Other portability fixes.
This commit is contained in:
Dimitrie O. Paun 2000-11-29 20:04:09 +00:00 committed by Alexandre Julliard
parent 161bc83164
commit 2af03e45b5
8 changed files with 89 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
configure vendored
View File

@ -5529,6 +5529,7 @@ for ac_hdr in \
sys/mount.h \
sys/msg.h \
sys/param.h \
sys/ptrace.h \
sys/reg.h \
sys/signal.h \
sys/shm.h \
@ -5537,6 +5538,7 @@ for ac_hdr in \
sys/statfs.h \
sys/strtio.h \
sys/syscall.h \
sys/user.h \
sys/wait.h \
sys/v86.h \
sys/v86intr.h \
@ -5548,17 +5550,17 @@ for ac_hdr in \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5552: checking for $ac_hdr" >&5
echo "configure:5554: 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 5557 "configure"
#line 5559 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:5564: \"$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*
@ -5585,12 +5587,12 @@ fi
done
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
echo "configure:5589: checking whether stat file-mode macros are broken" >&5
echo "configure:5591: 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 5594 "configure"
#line 5596 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -5643,12 +5645,12 @@ fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:5647: checking for working const" >&5
echo "configure:5649: 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 5652 "configure"
#line 5654 "configure"
#include "confdefs.h"
int main() {
@ -5697,7 +5699,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:5701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:5703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@ -5718,21 +5720,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
echo "configure:5722: checking for inline" >&5
echo "configure:5724: 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 5729 "configure"
#line 5731 "configure"
#include "confdefs.h"
int main() {
} int $ac_kw foo() {
; return 0; }
EOF
if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:5738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@ -5758,12 +5760,12 @@ EOF
esac
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:5762: checking for ANSI C header files" >&5
echo "configure:5764: 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 5767 "configure"
#line 5769 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@ -5771,7 +5773,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:5777: \"$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*
@ -5788,7 +5790,7 @@ rm -f conftest*
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 5792 "configure"
#line 5794 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@ -5806,7 +5808,7 @@ fi
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 5810 "configure"
#line 5812 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@ -5827,7 +5829,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 5831 "configure"
#line 5833 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -5838,7 +5840,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -5862,12 +5864,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:5866: checking for size_t" >&5
echo "configure:5868: 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 5871 "configure"
#line 5873 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -5895,7 +5897,7 @@ EOF
fi
echo $ac_n "checking size of long long""... $ac_c" 1>&6
echo "configure:5899: checking size of long long" >&5
echo "configure:5901: 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
@ -5903,7 +5905,7 @@ else
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
#line 5907 "configure"
#line 5909 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@ -5914,7 +5916,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:5920: \"$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
@ -5936,12 +5938,12 @@ EOF
echo $ac_n "checking "whether we can use re-entrant gethostbyname_r Linux style"""... $ac_c" 1>&6
echo "configure:5940: checking "whether we can use re-entrant gethostbyname_r Linux style"" >&5
echo "configure:5942: checking "whether we can use re-entrant gethostbyname_r Linux style"" >&5
if eval "test \"`echo '$''{'wine_cv_linux_gethostbyname_r_6'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 5945 "configure"
#line 5947 "configure"
#include "confdefs.h"
#include <netdb.h>
@ -5962,7 +5964,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:5966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:5968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_linux_gethostbyname_r_6=yes
else
@ -5988,12 +5990,12 @@ EOF
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:5992: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5
echo "configure:5994: 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 5997 "configure"
#line 5999 "configure"
#include "confdefs.h"
#include <sys/ioctl.h>
@ -6008,7 +6010,7 @@ int main() {
/*empty*/
; return 0; }
EOF
if { (eval echo configure:6012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_linux_joystick_22_api=yes
else
@ -6035,12 +6037,12 @@ fi
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:6039: checking "whether sys/vfs.h defines statfs"" >&5
echo "configure:6041: 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 6044 "configure"
#line 6046 "configure"
#include "confdefs.h"
#include <sys/types.h>
@ -6057,7 +6059,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:6061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_sys_vfs_has_statfs=yes
else
@ -6084,12 +6086,12 @@ fi
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:6088: checking "whether sys/statfs.h defines statfs"" >&5
echo "configure:6090: 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 6093 "configure"
#line 6095 "configure"
#include "confdefs.h"
#include <sys/types.h>
@ -6104,7 +6106,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:6108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_sys_statfs_has_statfs=yes
else
@ -6131,12 +6133,12 @@ fi
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:6135: checking "whether sys/mount.h defines statfs"" >&5
echo "configure:6137: 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 6140 "configure"
#line 6142 "configure"
#include "confdefs.h"
#include <sys/types.h>
@ -6151,7 +6153,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:6155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_sys_mount_has_statfs=yes
else
@ -6177,7 +6179,7 @@ fi
echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6
echo "configure:6181: checking "for statfs.f_bfree"" >&5
echo "configure:6183: 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
@ -6186,7 +6188,7 @@ else
wine_cv_statfs_bfree=no
else
cat > conftest.$ac_ext <<EOF
#line 6190 "configure"
#line 6192 "configure"
#include "confdefs.h"
#include <sys/types.h>
@ -6213,7 +6215,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:6217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_statfs_bfree=yes
else
@ -6237,7 +6239,7 @@ EOF
fi
echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6
echo "configure:6241: checking "for statfs.f_bavail"" >&5
echo "configure:6243: 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
@ -6246,7 +6248,7 @@ else
wine_cv_statfs_bavail=no
else
cat > conftest.$ac_ext <<EOF
#line 6250 "configure"
#line 6252 "configure"
#include "confdefs.h"
#include <sys/types.h>
@ -6273,7 +6275,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:6277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wine_cv_statfs_bavail=yes
else
@ -6298,12 +6300,12 @@ fi
echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6
echo "configure:6302: checking "for msg_accrights in struct msghdr"" >&5
echo "configure:6304: 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 6307 "configure"
#line 6309 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@ -6311,7 +6313,7 @@ int main() {
struct msghdr hdr; hdr.msg_accrights=0
; return 0; }
EOF
if { (eval echo configure:6315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_msg_accrights="yes"
else
@ -6334,12 +6336,12 @@ fi
echo $ac_n "checking "for sun_len in struct sockaddr_un"""... $ac_c" 1>&6
echo "configure:6338: checking "for sun_len in struct sockaddr_un"" >&5
echo "configure:6340: checking "for sun_len in struct sockaddr_un"" >&5
if eval "test \"`echo '$''{'ac_cv_c_sun_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 6343 "configure"
#line 6345 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@ -6348,7 +6350,7 @@ int main() {
static struct sockaddr_un addr; addr.sun_len = 1
; return 0; }
EOF
if { (eval echo configure:6352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:6354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_sun_len="yes"
else
@ -6371,12 +6373,12 @@ fi
echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6
echo "configure:6375: checking "whether we need to define __i386__"" >&5
echo "configure:6377: 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 6380 "configure"
#line 6382 "configure"
#include "confdefs.h"
#if (defined(i386) || defined(__i386)) && !defined(__i386__)
yes

2
configure.in
View File

@ -792,6 +792,7 @@ AC_CHECK_HEADERS(\
sys/mount.h \
sys/msg.h \
sys/param.h \
sys/ptrace.h \
sys/reg.h \
sys/signal.h \
sys/shm.h \
@ -800,6 +801,7 @@ AC_CHECK_HEADERS(\
sys/statfs.h \
sys/strtio.h \
sys/syscall.h \
sys/user.h \
sys/wait.h \
sys/v86.h \
sys/v86intr.h \

4
dlls/ntdll/signal_i386.c
View File

@ -29,6 +29,10 @@
# include <sys/vm86.h>
#endif
#ifdef HAVE_SYS_SIGNAL_H
# include <sys/signal.h>
#endif
#include "winnt.h"
#include "selectors.h"

6
include/config.h.in
View File

@ -401,6 +401,9 @@
/* Define if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define if you have the <sys/ptrace.h> header file. */
#undef HAVE_SYS_PTRACE_H
/* Define if you have the <sys/reg.h> header file. */
#undef HAVE_SYS_REG_H
@ -428,6 +431,9 @@
/* Define if you have the <sys/syscall.h> header file. */
#undef HAVE_SYS_SYSCALL_H
/* Define if you have the <sys/user.h> header file. */
#undef HAVE_SYS_USER_H
/* Define if you have the <sys/v86.h> header file. */
#undef HAVE_SYS_V86_H

9
server/context_i386.c
View File

@ -14,14 +14,17 @@
#include <sys/reg.h>
#endif
#include <unistd.h>
#include <sys/ptrace.h>
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/user.h>
#ifdef HAVE_SYS_USER_H
# include <sys/user.h>
#endif
#include "winbase.h"
#include "thread.h"
#include "request.h"

18
server/ptrace.c
View File

@ -11,9 +11,11 @@
#include <stdio.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
# include <sys/wait.h>
#endif
#include <unistd.h>
@ -37,7 +39,19 @@
#define PTRACE_POKEDATA PT_WRITE_D
#endif
#ifdef HAVE_SYS_PTRACE_H
static const int use_ptrace = 1; /* set to 0 to disable ptrace */
#else
static const int use_ptrace = 0;
#define PT_CONTINUE 0
#define PT_ATTACH 1
#define PT_DETACH 2
#define PT_READ_D 3
#define PT_WRITE_D 4
static int ptrace(int req, ...) { return -1; /*FAIL*/ }
#endif
/* handle a status returned by wait4 */
static int handle_child_status( struct thread *thread, int pid, int status )

1
server/request.c
View File

@ -33,6 +33,7 @@
#include "server.h"
#define WANT_REQUEST_HANDLERS
#include "request.h"
#include "wine/port.h"
/* Some versions of glibc don't define this */
#ifndef SCM_RIGHTS

1
win32/device.c
View File

@ -84,7 +84,6 @@ static BOOL DeviceIo_HASP (DWORD dwIoControlCode,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,
LPOVERLAPPED lpOverlapped);
/*
/*
* VxD names are taken from the Win95 DDK
*/