include/SDL_syswm.h
changeset 1133 609c060fd2a2
parent 1035 974ba6ae0fa3
child 1312 c9b51268668f
--- a/include/SDL_syswm.h	Thu Aug 25 20:31:58 2005 +0000
+++ b/include/SDL_syswm.h	Thu Sep 08 06:16:14 2005 +0000
@@ -48,14 +48,26 @@
 typedef struct SDL_SysWMinfo SDL_SysWMinfo;
 #else
 
+#if defined(__APPLE__) && defined(__MACH__)
+// conflicts with Quickdraw.h
+#define Cursor X11Cursor
+#endif
+
 /* This is the structure for custom window manager events */
-#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
+#if (defined(unix) || defined(__unix__) || defined(_AIX) || \
+         defined(__OpenBSD__) || defined(__NetBSD__) || \
+         (defined(__APPLE__) && defined(__MACH__))) && \
     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
-     !defined(__QNXNTO__))
+         !defined(__QNXNTO__))
  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#if defined(__APPLE__) && defined(__MACH__)
+// matches the re-define above
+#undef Cursor
+#endif
+
 /* These are the various supported subsystems under UNIX */
 typedef enum {
 	SDL_SYSWM_X11