From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 13 May 2005 22:18:47 +0000 (+0000)
Subject: Import vki_unistd.h on a need-to-know basis, rather than
X-Git-Tag: svn/VALGRIND_3_0_0~619
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87d9408ddff4577ecd79fa47b85ab6839a39af49;p=thirdparty%2Fvalgrind.git

Import vki_unistd.h on a need-to-know basis, rather than
universally through core.h.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3699
---

diff --git a/coregrind/core.h b/coregrind/core.h
index feca949afc..3daf0439f8 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -82,9 +82,6 @@
    external tools.
 */
 
-/* For system call numbers __NR_... */
-#include "vki_unistd.h"
-
 #include "core_asm.h"      // asm stuff
 #include "tool.h"          // tool stuff
 #include "core_arch.h"     // arch-specific stuff,  eg. x86/core_arch.h
diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index eb70990d69..d01f76adeb 100644
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -34,6 +34,7 @@
 #include "pub_core_aspacemgr.h"
 #include "pub_core_syscalls.h"
 #include "pub_core_tooliface.h"
+#include "vki_unistd.h"
 
 
 /* Define to debug the memory-leak-detector. */
diff --git a/coregrind/m_syscalls/priv_syscalls.h b/coregrind/m_syscalls/priv_syscalls.h
index 4e7fd50b1e..1d2100fa10 100644
--- a/coregrind/m_syscalls/priv_syscalls.h
+++ b/coregrind/m_syscalls/priv_syscalls.h
@@ -42,6 +42,8 @@
 #  error Unknown platform
 #endif
 
+#include "vki_unistd.h"
+
 // Offsets for the shadow state
 #define O_SYSCALL_NUM   (offsetof(VexGuestArchState, VGP_SYSCALL_NUM))
 #define O_SYSCALL_ARG1  (offsetof(VexGuestArchState, VGP_SYSCALL_ARG1))
diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index 7c5c518498..9259a6b5d0 100644
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -36,6 +36,7 @@
 #include "pub_core_stacktrace.h"
 #include "pub_core_syscalls.h"
 #include "pub_core_tooliface.h"
+#include "vki_unistd.h"
 
 
 /* ---------------------------------------------------------------------
diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 8f62a13221..1ff2b823c5 100644
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -66,6 +66,7 @@
 #include "pub_core_stacktrace.h"
 #include "pub_core_syscalls.h"
 #include "pub_core_tooliface.h"
+#include "vki_unistd.h"
 
 /* ---------------------------------------------------------------------
    Types and globals for the scheduler.
diff --git a/coregrind/x86/state.c b/coregrind/x86/state.c
index 161c6c261e..19fbee73aa 100644
--- a/coregrind/x86/state.c
+++ b/coregrind/x86/state.c
@@ -31,6 +31,7 @@
 #include "core.h"
 #include "pub_core_tooliface.h"
 #include "x86_private.h"
+#include "vki_unistd.h"
 #include <sys/ptrace.h>
 
 #include "libvex_guest_x86.h"