include/SDL_syswm.h
changeset 1133 609c060fd2a2
parent 1035 974ba6ae0fa3
child 1312 c9b51268668f
     1.1 --- a/include/SDL_syswm.h	Thu Aug 25 20:31:58 2005 +0000
     1.2 +++ b/include/SDL_syswm.h	Thu Sep 08 06:16:14 2005 +0000
     1.3 @@ -48,14 +48,26 @@
     1.4  typedef struct SDL_SysWMinfo SDL_SysWMinfo;
     1.5  #else
     1.6  
     1.7 +#if defined(__APPLE__) && defined(__MACH__)
     1.8 +// conflicts with Quickdraw.h
     1.9 +#define Cursor X11Cursor
    1.10 +#endif
    1.11 +
    1.12  /* This is the structure for custom window manager events */
    1.13 -#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
    1.14 +#if (defined(unix) || defined(__unix__) || defined(_AIX) || \
    1.15 +         defined(__OpenBSD__) || defined(__NetBSD__) || \
    1.16 +         (defined(__APPLE__) && defined(__MACH__))) && \
    1.17      (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
    1.18 -     !defined(__QNXNTO__))
    1.19 +         !defined(__QNXNTO__))
    1.20   /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
    1.21  #include <X11/Xlib.h>
    1.22  #include <X11/Xatom.h>
    1.23  
    1.24 +#if defined(__APPLE__) && defined(__MACH__)
    1.25 +// matches the re-define above
    1.26 +#undef Cursor
    1.27 +#endif
    1.28 +
    1.29  /* These are the various supported subsystems under UNIX */
    1.30  typedef enum {
    1.31  	SDL_SYSWM_X11