From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Sep 2004 07:31:12 +0000 (+0000)
Subject: Move the include of linux/fs.h before the include of sys/un.h as the
X-Git-Tag: svn/VALGRIND_3_0_0~1644
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19bd50ea160c59975d8a04ed354132d8d62f8aac;p=thirdparty%2Fvalgrind.git

Move the include of linux/fs.h before the include of sys/un.h as the
latter includes string.h on some older systems which then causes
problems when linux/fs.h includes linux/string.h due to it turning
various string functions into pre-processor macros.

This was the problem behind bug #87820 which actually had nothing to
do with gcc 2.95 and everything to do with the glibc and kernel
headers that the system had installed.


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

diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index f1019b167d..d5d9167669 100644
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -41,6 +41,7 @@
 /* ugly hack to avoid that kernel headers redefine stuff from sys/time.h */
 #define _LINUX_TIME_H
 #endif
+#include <linux/fs.h>     /* for filing system ioctls */
 #include <linux/net.h>    /* for the SYS_* constants */
 #include <sys/resource.h> /* for struct rlimit */
 #include <linux/shm.h>    /* for struct shmid_ds & struct ipc_perm */
@@ -65,7 +66,6 @@
 #include <linux/timex.h>  /* for adjtimex */
 #include <linux/hdreg.h>  /* for hard drive ioctls */
 #include <linux/netlink.h>/* Some systems need this for linux/fs.h */
-#include <linux/fs.h>     /* for filing system ioctls */
 #ifdef HAVE_LINUX_FB_H
 #include <linux/fb.h>     /* for fb_* structs */
 #endif