Fix X11 compile and interrogate issues

This commit is contained in:
rdb 2015-04-26 15:27:39 +02:00
parent 589a1b52ac
commit a745184f25

View File

@ -30,14 +30,21 @@
#ifdef CPPPARSER #ifdef CPPPARSER
// A simple hack so interrogate can get all of the necessary // A simple hack so interrogate can get all of the necessary
// typenames. // typenames.
typedef int X11_Display; typedef struct _XDisplay X11_Display;
typedef int X11_Window; typedef unsigned int XID;
typedef int X11_Cursor; typedef unsigned int Atom;
typedef int XErrorEvent; typedef unsigned int Cardinal;
typedef int XVisualInfo; typedef XID Colormap;
typedef int Atom; typedef XID X11_Window;
typedef int XIM; typedef XID X11_Cursor;
typedef int XIC; typedef struct _XIM *XIM;
typedef struct _XIC *XIC;
struct XErrorEvent;
struct XVisualInfo;
#define Bool int
#define Status int
#define True 1
#define False 0
#else #else
#include "pre_x11_include.h" #include "pre_x11_include.h"
@ -45,6 +52,7 @@ typedef int XIC;
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Intrinsic.h>
#ifdef HAVE_XRANDR #ifdef HAVE_XRANDR
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>