Use our own unistd.h, because the system one might be missing some of the

constants.

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

diff --git a/memcheck/tests/scalar.h b/memcheck/tests/scalar.h
index d1f3d34bcb3bb4ff3c450926da46944344773caf..4b0e23a3d577de117c16b133f947c60c2e87af9f 100644 (file)
--- a/memcheck/tests/scalar.h
+++ b/memcheck/tests/scalar.h
@@ -1,13 +1,19 @@
+// XXX: x86-specific, so these should be in x86/, or something
+#include "../../coregrind/x86-linux/vki_unistd.h"
+
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/syscall.h>
 #include <sys/stat.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
 
+// Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+// declare this ourselves.
+extern long int syscall (long int __sysno, ...) __THROW;
+
 // Thorough syscall scalar arg checking.  Also serves as thorough checking
 // for (very) basic syscall use.  Generally not trying to do anything
 // meaningful with the syscalls.