xorg-server: Changes to 'upstream-experimental'
GL/glx/indirect_dispatch_swap.c | 2 +-
GL/glx/indirect_program.c | 2 +-
GL/glx/indirect_texture_compression.c | 2 +-
GL/glx/swap_interval.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ee3000f97d7561b2137e247495468a17e6e3b4c3
Author: Drew Parsons <dparsons@debian.org>
Date: Sun Mar 4 16:00:52 2007 +1100
Support for Hurd and other non-linux GNU systems.
Non-linux GNU systems such as Hurd will define __GLIBC__ or __GNU__
rather than __linux__. This must be tested for in order to get byteswap.h
included. See commit 594d180fe4f5d508569f9b263799da5af5a97087 (24 Dec
2006) and other related patches (fixed in upstream HEAD then, why was
the patch not brought across to the 1.3 branch?).
diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index 9c58ef1..136f0d0 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff --git a/GL/glx/indirect_program.c b/GL/glx/indirect_program.c
index d0fd3d1..eae128a 100644
--- a/GL/glx/indirect_program.c
+++ b/GL/glx/indirect_program.c
@@ -46,7 +46,7 @@ #include "glthread.h"
#include "dispatch.h"
#include "glapioffsets.h"
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff --git a/GL/glx/indirect_texture_compression.c b/GL/glx/indirect_texture_compression.c
index 0c42ea0..11f63c2 100644
--- a/GL/glx/indirect_texture_compression.c
+++ b/GL/glx/indirect_texture_compression.c
@@ -39,7 +39,7 @@ #include "glapi.h"
#include "glthread.h"
#include "dispatch.h"
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff --git a/GL/glx/swap_interval.c b/GL/glx/swap_interval.c
index bcc1c47..f049ce5 100644
--- a/GL/glx/swap_interval.c
+++ b/GL/glx/swap_interval.c
@@ -40,7 +40,7 @@ #include "glthread.h"
#include "dispatch.h"
#include "glapioffsets.h"
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
Reply to: