From 19bd50ea160c59975d8a04ed354132d8d62f8aac Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 1 Sep 2004 07:31:12 +0000 Subject: [PATCH] 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 --- coregrind/vg_unsafe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h index f1019b167..d5d916766 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 /* for filing system ioctls */ #include /* for the SYS_* constants */ #include /* for struct rlimit */ #include /* for struct shmid_ds & struct ipc_perm */ @@ -65,7 +66,6 @@ #include /* for adjtimex */ #include /* for hard drive ioctls */ #include /* Some systems need this for linux/fs.h */ -#include /* for filing system ioctls */ #ifdef HAVE_LINUX_FB_H #include /* for fb_* structs */ #endif