summaryrefslogtreecommitdiff
path: root/syscall.c
diff options
context:
space:
mode:
authorWichert Akkerman <wichert@deephackmode.org>1999-06-24 13:55:29 +0000
committerWichert Akkerman <wichert@deephackmode.org>1999-06-24 13:55:29 +0000
commit2b483ba988f29e4715db8ee80b7a5ebc77e5027d (patch)
treea74d11b65e9b46cc3263ec373ca77d98468b6edf /syscall.c
parente6f876c49de4a5f535e476804e4627f8e0ecb869 (diff)
downloadstrace-2b483ba988f29e4715db8ee80b7a5ebc77e5027d.tar.gz
strace-2b483ba988f29e4715db8ee80b7a5ebc77e5027d.tar.bz2
strace-2b483ba988f29e4715db8ee80b7a5ebc77e5027d.tar.xz
Fix conditions for including sys/reg.h and linux/ptrace.h
Diffstat (limited to 'syscall.c')
-rw-r--r--syscall.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/syscall.c b/syscall.c
index e8d8a1f..8680a88 100644
--- a/syscall.c
+++ b/syscall.c
@@ -37,14 +37,15 @@
#include <sys/user.h>
#include <sys/syscall.h>
#include <sys/param.h>
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && (defined(I386) || defined(M68K))
+
+#if __GLIBC__ == 2 && ((defined(I386) && __GLIBC_MINOR__ >= 0) || (defined(M68K) && __GLIBC_MINOR__ >= 1))
# include <sys/reg.h>
+#else
+# if defined LINUX
+# include <linux/ptrace.h>
+# endif /* LINUX */
#endif
-#if defined LINUX && __GLIBC__ < 2
-#include <linux/ptrace.h>
-#endif /* LINUX */
-
#ifndef SYS_ERRLIST_DECLARED
extern int sys_nerr;
extern char *sys_errlist[];