Mercurial > sdl-ios-xcode
comparison include/SDL_syswm.h @ 870:95f22f17e44a
Date: Wed, 3 Mar 2004 12:44:21 +0200
From: "Mike Gorchak"
Subject: Misc fixes again
I've added custom WM info for the QNX (same as generic for now), which allows to compile all applications, which included SDL_syswm.h directly, otherwise DISABLE_X11 appearing to be not defined and X11 info was used instead, which is wrong.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 04 Mar 2004 05:41:57 +0000 |
parents | b8d311d90021 |
children | 04a403e4ccf5 |
comparison
equal
deleted
inserted
replaced
869:ae4ab3ac89a9 | 870:95f22f17e44a |
---|---|
48 typedef struct SDL_SysWMinfo SDL_SysWMinfo; | 48 typedef struct SDL_SysWMinfo SDL_SysWMinfo; |
49 #else | 49 #else |
50 | 50 |
51 /* This is the structure for custom window manager events */ | 51 /* This is the structure for custom window manager events */ |
52 #if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \ | 52 #if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \ |
53 (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX)) | 53 (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \ |
54 !defined(__QNXNTO__)) | |
54 /* AIX is unix, of course, but the native compiler CSet doesn't define unix */ | 55 /* AIX is unix, of course, but the native compiler CSet doesn't define unix */ |
55 #include <X11/Xlib.h> | 56 #include <X11/Xlib.h> |
56 #include <X11/Xatom.h> | 57 #include <X11/Xatom.h> |
57 | 58 |
58 /* These are the various supported subsystems under UNIX */ | 59 /* These are the various supported subsystems under UNIX */ |
145 int wimpVersion; /* Wimp version running under */ | 146 int wimpVersion; /* Wimp version running under */ |
146 int taskHandle; /* The RISCOS task handle */ | 147 int taskHandle; /* The RISCOS task handle */ |
147 int window; /* The RISCOS display window */ | 148 int window; /* The RISCOS display window */ |
148 } SDL_SysWMinfo; | 149 } SDL_SysWMinfo; |
149 | 150 |
151 #elif defined(__QNXNTO__) | |
152 #include <sys/neutrino.h> | |
153 #include <Ph.h> | |
154 | |
155 /* The QNX custom event structure */ | |
156 struct SDL_SysWMmsg { | |
157 SDL_version version; | |
158 int data; | |
159 }; | |
160 | |
161 /* The QNX custom window manager information structure */ | |
162 typedef struct { | |
163 SDL_version version; | |
164 int data; | |
165 } SDL_SysWMinfo; | |
166 | |
150 #else | 167 #else |
151 | 168 |
152 /* The generic custom event structure */ | 169 /* The generic custom event structure */ |
153 struct SDL_SysWMmsg { | 170 struct SDL_SysWMmsg { |
154 SDL_version version; | 171 SDL_version version; |