Hi all, while compiling mesa on Linux/ARM (and for Linux/ARM), I had a problem with the servermd.h file coming from xorg-server.
I found incorrect conditional tests on "linux" variable while it should be on "__linux__" variable. This mistake occurs at several places in the servermd.h file. The attached patch is actually fixing this issue. Cheers, Arnaud
--- a/xorg/xserver/tree/include/servermd.h +++ b/xorg/xserver/tree/include/servermd.h @@ -208,7 +208,7 @@ #endif /* alpha */ -#if defined (linux) && defined (__s390__) +#if defined (__linux__) && defined (__s390__) #define IMAGE_BYTE_ORDER MSBFirst #define BITMAP_BIT_ORDER MSBFirst @@ -219,7 +219,7 @@ #endif /* linux/s390 */ -#if defined (linux) && defined (__s390x__) +#if defined (__linux__) && defined (__s390x__) #define IMAGE_BYTE_ORDER MSBFirst #define BITMAP_BIT_ORDER MSBFirst @@ -264,7 +264,7 @@ #endif /* SVR4 / BSD / i386 */ -#if defined (linux) && defined (__mc68000__) +#if defined (__linux__) && defined (__mc68000__) #define IMAGE_BYTE_ORDER MSBFirst #define BITMAP_BIT_ORDER MSBFirst @@ -273,14 +273,14 @@ #endif /* linux/m68k */ /* linux on ARM */ -#if defined(linux) && defined(__arm__) +#if defined(__linux__) && defined(__arm__) #define IMAGE_BYTE_ORDER LSBFirst #define BITMAP_BIT_ORDER LSBFirst #define GLYPHPADBYTES 4 #endif /* linux on IBM S/390 */ -#if defined (linux) && defined (__s390__) +#if defined (__linux__) && defined (__s390__) #define IMAGE_BYTE_ORDER MSBFirst #define BITMAP_BIT_ORDER MSBFirst #define GLYPHPADBYTES 4
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
