commit 5bd7cf8545631b1e249b6a0ec80e7a5925a3c584
author Roland McGrath <roland@redhat.com> Fri Jan 24 04:31:18 2003 +0000
committer Roland McGrath <roland@redhat.com> Fri Jan 24 04:31:18 2003 +0000
tree e3c109d31238a0fd13b9fad72de925c8e9ee7d4d
parent 6a39c21335a389fc9441f1e829fd66e94578ff59

2003-01-23  Roland McGrath  <roland@redhat.com>

	* process.c: Reorder includes to put sys/reg.h before linux/ptrace.h,
	since they can conflict.

process.c

diff --git a/process.c b/process.c
index baa13a0..c24bfc6 100644
--- a/process.c
+++ b/process.c
@@ -70,11 +70,6 @@
 #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
@@ -85,6 +80,11 @@
 #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