From: Roland McGrath <roland@redhat.com>
Date: Fri, 24 Jan 2003 04:31:18 +0000 (+0000)
Subject: 2003-01-23  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd7cf8545631b1e249b6a0ec80e7a5925a3c584;p=strace

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.
---

diff --git a/process.c b/process.c
index baa13a0a..c24bfc66 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