Skip to content
Permalink
Browse files

More dynamic X11 fixes...catches some code in Xlib headers that caused

 dependencies...
  • Loading branch information
icculus committed Jan 4, 2006
1 parent fcf0067 commit 39fd9b94bdb90d37ff44f6f7b6931c5ea844e6f2
@@ -37,12 +37,6 @@ Equipment Corporation.

#include "../../x11/SDL_x11dyn.h"

/* Workaround code in headers... */
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend

static XExtensionInfo _panoramiX_ext_info_data;
static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
@@ -58,12 +58,6 @@ SOFTWARE.

#include "../../x11/SDL_x11dyn.h"

/* Workaround code in headers... */
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend

static XExtensionInfo _xv_info_data;
static XExtensionInfo *xv_info = &_xv_info_data;
static char *xv_extension_name = XvName;
@@ -66,12 +66,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc

#include "../../x11/SDL_x11dyn.h"

/* Workaround code in headers... */
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend

extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
extern char *SDL_NAME(xdga_extension_name);

@@ -30,12 +30,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc

#include "../../x11/SDL_x11dyn.h"

/* Workaround code in headers... */
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend

/* If you change this, change the Bases[] array below as well */
#define MAX_HEADS 16

@@ -49,12 +49,6 @@ from Kaleb S. KEITHLEY.

#include "../../x11/SDL_x11dyn.h"

/* Workaround code in headers... */
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend

#ifdef DEBUG
#include <stdio.h>
#endif
@@ -22,6 +22,7 @@

/*#define DEBUG_DYNAMIC_X11 1*/

#define __SDL_NO_REDEFINE_X11_HEADER_SYMS 1
#include "SDL_x11dyn.h"

#ifdef DEBUG_DYNAMIC_X11
@@ -65,6 +65,15 @@ typedef Status (*SDL_X11_XESetEventToWireRetType)(Display*,XEvent*,xEvent*);
/* Macro in the xlib headers, not an actual symbol... */
#define pXDestroyImage XDestroyImage

/* Workaround code in headers... */
#if !__SDL_NO_REDEFINE_X11_HEADER_SYMS
#define _XFlush p_XFlush
#define _XFlushGCCache p_XFlushGCCache
#define _XReply p_XReply
#define _XSend p_XSend
#define _XData32 p_XData32
#endif

int SDL_X11_LoadSymbols(void);
void SDL_X11_UnloadSymbols(void);

@@ -130,6 +130,8 @@ SDL_X11_SYM(void,_XReadPad,(Display*,char*,long))
SDL_X11_SYM(void,_XSend,(Display*,_Xconst char*,long))
SDL_X11_SYM(Status,_XReply,(Display*,xReply*,int,Bool))
SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display*,xGenericReply*))
SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len))
SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len))

#if NeedWidePrototypes
SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))

0 comments on commit 39fd9b9

Please sign in to comment.