summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2006-01-19 00:06:57 +0000
committerEric Anholt <anholt@freebsd.org>2006-01-19 00:06:57 +0000
commitadce1f16e0d815e5c762407da3544a7d2eff9303 (patch)
tree0c4c3105c8433cb3d76d17ac5a50a862cb62cace
parent1c3f8727b2349c9b988eaa744f11366322d42538 (diff)
Only try to use byteswap.h on linux. Assume that everyone else (thinking of
BSDs here) has sys/endian.h, and use macros as appropriate for the names. This should probably be in a gloabl header.
-rw-r--r--ChangeLog9
-rw-r--r--GL/glx/indirect_dispatch.c1
-rw-r--r--GL/glx/indirect_dispatch_swap.c7
-rw-r--r--GL/glx/indirect_util.c7
4 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d90cfe09a..93ff47230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-18 Eric Anholt <anholt@FreeBSD.org>
+
+ * GL/glx/indirect_dispatch.c:
+ * GL/glx/indirect_dispatch_swap.c:
+ * GL/glx/indirect_util.c:
+ Only try to use byteswap.h on linux. Assume that everyone else
+ (thinking of BSDs here) has sys/endian.h, and use macros as appropriate
+ for the names. This should probably be in a gloabl header.
+
2006-01-18 Adam Jackson <ajax@freedesktop.org>
* fb/fbblt.c:
diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c
index 3aabd8cf8..8c270ea9b 100644
--- a/GL/glx/indirect_dispatch.c
+++ b/GL/glx/indirect_dispatch.c
@@ -28,7 +28,6 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#include <byteswap.h>
#include <inttypes.h>
#include "indirect_size.h"
#include "indirect_size_get.h"
diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index 16e2b605a..a6df3521b 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,14 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
+#ifdef __linux__
#include <byteswap.h>
+#else
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#endif
#include <inttypes.h>
#include "indirect_size.h"
#include "indirect_size_get.h"
diff --git a/GL/glx/indirect_util.c b/GL/glx/indirect_util.c
index d969cc298..bf0ba66f2 100644
--- a/GL/glx/indirect_util.c
+++ b/GL/glx/indirect_util.c
@@ -26,7 +26,14 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
+#ifdef __linux__
#include <byteswap.h>
+#else
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#endif
#include <inttypes.h>
#include "indirect_size.h"
#include "indirect_size_get.h"