]> granicus.if.org Git - strace/commitdiff
2003-01-23 Roland McGrath <roland@redhat.com>
authorRoland McGrath <roland@redhat.com>
Fri, 24 Jan 2003 04:31:18 +0000 (04:31 +0000)
committerRoland McGrath <roland@redhat.com>
Fri, 24 Jan 2003 04:31:18 +0000 (04:31 +0000)
* process.c: Reorder includes to put sys/reg.h before linux/ptrace.h,
since they can conflict.

process.c

index baa13a0aa7a2868d09f1529abb874a470b5e21e2..c24bfc665d1013b8c9e09583278805c22fbdff58 100644 (file)
--- a/process.c
+++ b/process.c
 #endif
 #endif /* HAVE_ASM_REG_H */
 
-#ifdef HAVE_LINUX_PTRACE_H
-#undef PTRACE_SYSCALL
-#include <linux/ptrace.h>
-#endif
-
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
 #ifndef PTRACE_PEEKUSR
 #endif
 #endif
 
+#ifdef HAVE_LINUX_PTRACE_H
+#undef PTRACE_SYSCALL
+#include <linux/ptrace.h>
+#endif
+
 #ifdef HAVE_LINUX_FUTEX_H
 #include <linux/futex.h>
 #endif