include/SDL_syswm.h
changeset 1133 609c060fd2a2
parent 1035 974ba6ae0fa3
child 1312 c9b51268668f
equal deleted inserted replaced
1132:a0d3514c04b2 1133:609c060fd2a2
    46 #ifdef SDL_PROTOTYPES_ONLY
    46 #ifdef SDL_PROTOTYPES_ONLY
    47 struct SDL_SysWMinfo;
    47 struct SDL_SysWMinfo;
    48 typedef struct SDL_SysWMinfo SDL_SysWMinfo;
    48 typedef struct SDL_SysWMinfo SDL_SysWMinfo;
    49 #else
    49 #else
    50 
    50 
       
    51 #if defined(__APPLE__) && defined(__MACH__)
       
    52 // conflicts with Quickdraw.h
       
    53 #define Cursor X11Cursor
       
    54 #endif
       
    55 
    51 /* This is the structure for custom window manager events */
    56 /* This is the structure for custom window manager events */
    52 #if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
    57 #if (defined(unix) || defined(__unix__) || defined(_AIX) || \
       
    58          defined(__OpenBSD__) || defined(__NetBSD__) || \
       
    59          (defined(__APPLE__) && defined(__MACH__))) && \
    53     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
    60     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
    54      !defined(__QNXNTO__))
    61          !defined(__QNXNTO__))
    55  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
    62  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
    56 #include <X11/Xlib.h>
    63 #include <X11/Xlib.h>
    57 #include <X11/Xatom.h>
    64 #include <X11/Xatom.h>
       
    65 
       
    66 #if defined(__APPLE__) && defined(__MACH__)
       
    67 // matches the re-define above
       
    68 #undef Cursor
       
    69 #endif
    58 
    70 
    59 /* These are the various supported subsystems under UNIX */
    71 /* These are the various supported subsystems under UNIX */
    60 typedef enum {
    72 typedef enum {
    61 	SDL_SYSWM_X11
    73 	SDL_SYSWM_X11
    62 } SDL_SYSWM_TYPE;
    74 } SDL_SYSWM_TYPE;