|
From: <sv...@va...> - 2005-06-19 15:58:35
|
Author: sewardj Date: 2005-06-19 16:58:33 +0100 (Sun, 19 Jun 2005) New Revision: 3949 Log: Un-break the build on SuSE 9.1 (x86). It seems that something in <fcntl.h> messes up stuff acquired indirectly from vki-x86-linux.h. This fix is therefore a kludge; it merely puts our defines ahead of the glibc ones. The right solution is to entirely remove the glibc dependency. Modified: trunk/coregrind/ume.c Modified: trunk/coregrind/ume.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coregrind/ume.c 2005-06-19 15:46:27 UTC (rev 3948) +++ trunk/coregrind/ume.c 2005-06-19 15:58:33 UTC (rev 3949) @@ -33,6 +33,11 @@ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 =20 +#include "pub_core_basics.h" +#include "pub_core_libcbase.h" +#include "pub_core_machine.h" +#include "ume.h" + #include <sys/mman.h> #include <fcntl.h> #include <errno.h> @@ -42,11 +47,6 @@ #include <unistd.h> #include <assert.h> =20 -#include "pub_core_basics.h" -#include "pub_core_libcbase.h" -#include "pub_core_machine.h" -#include "ume.h" - #if ELFSZ =3D=3D 64 #define ESZ(x) Elf64_##x #elif ELFSZ =3D=3D 32 |