From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Aug 2004 08:11:34 +0000 (+0000)
Subject: Minor rejigging of includes to help compilation on Debian systems.
X-Git-Tag: svn/VALGRIND_2_2_0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ff805b9323957395b9c8694ba59089a5a5e94bc;p=thirdparty%2Fvalgrind.git

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 6d65c2ecdd..04cb3345f4 100644
--- 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 263e7fa0c6..f1019b167d 100644
--- 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 */