--- xserver/GL/glx/swap_interval.c.orig	2006-10-21 19:00:51.000000000 +0200
+++ xserver/GL/glx/swap_interval.c	2006-11-03 00:06:43.000000000 +0100
@@ -47,6 +47,11 @@
 #define bswap_16 __swap16
 #define bswap_32 __swap32
 #define bswap_64 __swap64
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define bswap_16 OSSwapInt16
+#define bswap_32 OSSwapInt32
+#define bswap_64 OSSwapInt64
 #else
 #include <sys/endian.h>
 #define bswap_16 bswap16
--- xserver/GL/glx/indirect_util.c.orig	2006-10-21 19:00:44.000000000 +0200
+++ xserver/GL/glx/indirect_util.c	2006-11-03 00:06:32.000000000 +0100
@@ -35,6 +35,11 @@
 #define bswap_16 __swap16
 #define bswap_32 __swap32
 #define bswap_64 __swap64
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define bswap_16 OSSwapInt16
+#define bswap_32 OSSwapInt32
+#define bswap_64 OSSwapInt64
 #else
 #include <sys/endian.h>
 #define bswap_16 bswap16
--- xserver/GL/glx/indirect_texture_compression.c.orig	2006-10-21 19:00:34.000000000 +0200
+++ xserver/GL/glx/indirect_texture_compression.c	2006-11-03 00:06:11.000000000 +0100
@@ -46,6 +46,11 @@
 #define bswap_16 __swap16
 #define bswap_32 __swap32
 #define bswap_64 __swap64
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define bswap_16 OSSwapInt16
+#define bswap_32 OSSwapInt32
+#define bswap_64 OSSwapInt64
 #else
 #include <sys/endian.h>
 #define bswap_16 bswap16
--- xserver/GL/glx/indirect_program.c.orig	2006-10-21 18:59:52.000000000 +0200
+++ xserver/GL/glx/indirect_program.c	2006-11-03 00:05:13.000000000 +0100
@@ -53,6 +53,11 @@
 #define bswap_16 __swap16
 #define bswap_32 __swap32
 #define bswap_64 __swap64
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define bswap_16 OSSwapInt16
+#define bswap_32 OSSwapInt32
+#define bswap_64 OSSwapInt64
 #else
 #include <sys/endian.h>
 #define bswap_16 bswap16
--- xserver/GL/glx/indirect_dispatch_swap.c.orig	2006-10-21 19:00:23.000000000 +0200
+++ xserver/GL/glx/indirect_dispatch_swap.c	2006-11-03 00:04:33.000000000 +0100
@@ -35,6 +35,11 @@
 #define bswap_16 __swap16
 #define bswap_32 __swap32
 #define bswap_64 __swap64
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define bswap_16 OSSwapInt16
+#define bswap_32 OSSwapInt32
+#define bswap_64 OSSwapInt64
 #else
 #include <sys/endian.h>
 #define bswap_16 bswap16