Skip to content

Commit

Permalink
Date: Wed, 3 Mar 2004 12:44:21 +0200
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
slouken committed Mar 4, 2004
1 parent 37c4f1c commit a64bcf9
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion include/SDL_syswm.h
Expand Up @@ -50,7 +50,8 @@ typedef struct SDL_SysWMinfo SDL_SysWMinfo;

/* This is the structure for custom window manager events */
#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
(!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
(!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
!defined(__QNXNTO__))
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
Expand Down Expand Up @@ -147,6 +148,22 @@ typedef struct {
int window; /* The RISCOS display window */
} SDL_SysWMinfo;

#elif defined(__QNXNTO__)
#include <sys/neutrino.h>
#include <Ph.h>

/* The QNX custom event structure */
struct SDL_SysWMmsg {
SDL_version version;
int data;
};

/* The QNX custom window manager information structure */
typedef struct {
SDL_version version;
int data;
} SDL_SysWMinfo;

#else

/* The generic custom event structure */
Expand Down

0 comments on commit a64bcf9

Please sign in to comment.