Date: Wed, 3 Mar 2004 12:44:21 +0200
authorSam Lantinga <slouken@libsdl.org>
Thu, 04 Mar 2004 05:41:57 +0000
changeset 87095f22f17e44a
parent 869 ae4ab3ac89a9
child 871 9cc9e2462d9a
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.
include/SDL_syswm.h
     1.1 --- a/include/SDL_syswm.h	Thu Mar 04 05:39:17 2004 +0000
     1.2 +++ b/include/SDL_syswm.h	Thu Mar 04 05:41:57 2004 +0000
     1.3 @@ -50,7 +50,8 @@
     1.4  
     1.5  /* This is the structure for custom window manager events */
     1.6  #if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
     1.7 -    (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
     1.8 +    (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
     1.9 +     !defined(__QNXNTO__))
    1.10   /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
    1.11  #include <X11/Xlib.h>
    1.12  #include <X11/Xatom.h>
    1.13 @@ -147,6 +148,22 @@
    1.14  	int window;			/* The RISCOS display window */
    1.15  } SDL_SysWMinfo;
    1.16  
    1.17 +#elif defined(__QNXNTO__)
    1.18 +#include <sys/neutrino.h>
    1.19 +#include <Ph.h>
    1.20 +
    1.21 +/* The QNX custom event structure */
    1.22 +struct SDL_SysWMmsg {
    1.23 +	SDL_version version;
    1.24 +	int data;
    1.25 +};
    1.26 +
    1.27 +/* The QNX custom window manager information structure */
    1.28 +typedef struct {
    1.29 +	SDL_version version;
    1.30 +	int data;
    1.31 +} SDL_SysWMinfo;
    1.32 +
    1.33  #else
    1.34  
    1.35  /* The generic custom event structure */