xserver: Branch 'master' - 2 commits

[Drew Parsons]

 GL/glx/indirect_dispatch_swap.c       |    2 +-
 GL/glx/indirect_program.c             |    2 +-
 GL/glx/indirect_reqsize.c             |    2 +-
 GL/glx/indirect_texture_compression.c |    2 +-
 GL/glx/indirect_util.c                |    2 +-
 GL/glx/swap_interval.c                |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 (from parents)
Merge: 9423ac134a2a9800787c4978d384827cc4e61fc8 82912ad7709e8cf4a5f8a9fa6b47f789842a3fe9
Author: Drew Parsons <drew at pug.localdomain>
Date:   Fri Dec 1 15:21:57 2006 +1100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

diff-tree 9423ac134a2a9800787c4978d384827cc4e61fc8 (from 8956f63a941bf0a5f157d47b33e6221601a75040)
Author: Drew Parsons <drew at pug.localdomain>
Date:   Fri Dec 1 15:21:05 2006 +1100

    GNU/FreeBSD support in GLX: include byteswap.h for FreeBSD systems
    defining __GLIBC__, as done already for Linux and Hurd (cf. bug #5613).
    Also includes some more __GNU__ checks on top of those made in
    commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1.
    Thanks Petr Salinger (Debian bug #400869).

diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index 1d45676..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>
-#if defined(__linux__) || defined(__GNU__)
+#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..8d5f0e6 100644
--- a/GL/glx/indirect_program.c
+++ b/GL/glx/indirect_program.c
@@ -46,7 +46,7 @@
 #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_reqsize.c b/GL/glx/indirect_reqsize.c
index 1c332da..d3e2bc5 100644
--- a/GL/glx/indirect_reqsize.c
+++ b/GL/glx/indirect_reqsize.c
@@ -31,7 +31,7 @@
 #include "indirect_size.h"
 #include "indirect_reqsize.h"
 
-#if defined(__linux__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #  include <byteswap.h>
 #  define SWAP_32(v)  do { (v) = bswap_32(v); } while(0)
 #else
diff --git a/GL/glx/indirect_texture_compression.c b/GL/glx/indirect_texture_compression.c
index 0c42ea0..35af1d2 100644
--- a/GL/glx/indirect_texture_compression.c
+++ b/GL/glx/indirect_texture_compression.c
@@ -39,7 +39,7 @@
 #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/indirect_util.c b/GL/glx/indirect_util.c
index 2d64f33..09b7ab8 100644
--- a/GL/glx/indirect_util.c
+++ b/GL/glx/indirect_util.c
@@ -28,7 +28,7 @@
 #include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxproto.h>
-#if defined(__linux__) || defined(__GNU__)
+#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..c4137c1 100644
--- a/GL/glx/swap_interval.c
+++ b/GL/glx/swap_interval.c
@@ -40,7 +40,7 @@
 #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>