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 feca949afc335fc6db66fc9dacfb4048a1340ef5..3daf0439f812d5b85a4b24b56936a9f8a9cd0525 100644 (file)
--- 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 eb70990d693d779235a5582539ddb1eefa8fd294..d01f76adeb7ca6a72ff22dc47a24d82c42f49e2d 100644 (file)
--- 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 4e7fd50b1ecc1b4dea815ff6234bb61d1610997d..1d2100fa10bc928009da661b4f8a4f0909a0a6e1 100644 (file)
--- 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 7c5c518498d62da794f24d919642fb7ddd542bf7..9259a6b5d022615a3fe16220603b5a8e024227d8 100644 (file)
--- 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 8f62a13221e9a9d6eac46fd9000114d01641b7b3..1ff2b823c5e126458a76fd2f04004e90c9823b50 100644 (file)
--- 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 161c6c261e1d6ce6eb9983bb0329dfffab90133b..19fbee73aa5dc8e41536428a501b1b6ba9989cc4 100644 (file)
--- 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"