Minor rejigging of includes to help compilation on Debian systems.

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

diff --git a/configure.in b/configure.in
index 6d65c2ecdd86f27795527f00e7629f263304e152..04cb3345f418af150259fd3cf73426866cdfa2b9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -331,7 +331,7 @@ AC_SUBST(PREFERRED_STACK_BOUNDARY)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h sys/endian.h endian.h termios.h unistd.h utime.h linux/fb.h linux/mii.h mqueue.h])
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h sys/endian.h endian.h termios.h unistd.h utime.h linux/fb.h linux/mii.h mqueue.h linux/compiler.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T

diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index 263e7fa0c6a092ba15f15968132ef3fab95cb217..f1019b167d2c57819da4eb5c3343623b36463df5 100644 (file)
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -50,11 +50,11 @@
 #include <net/if.h>       /* for struct ifreq et al */
 #include <net/if_arp.h>   /* for struct arpreq */
 #include <net/route.h>    /* for struct rtentry */
-#ifdef KERNEL_2_6
+#ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h> /* for __user definition */
 #endif
-#include <asm/ipc.h>      /* for struct ipc_kludge */
 #include <linux/msg.h>    /* for struct msgbuf */
+#include <asm/ipc.h>      /* for struct ipc_kludge */
 #include <linux/sem.h>    /* for struct sembuf */
 
 #include <scsi/sg.h>      /* for the SG_* ioctls */