pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
dependencies...

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401229
This commit is contained in:
Ryan C. Gordon 2006-01-04 22:57:50 +00:00
parent 72c870cf14
commit d28ecd1a1c
8 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video/Xext/Xinerama/Xinerama.c
View file

@ -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;

6
src/video/Xext/Xv/Xv.c
View file

@ -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;

6
src/video/Xext/Xxf86dga/XF86DGA.c
View file

@ -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);

6
src/video/Xext/Xxf86dga/XF86DGA2.c
View file

@ -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

6
src/video/Xext/Xxf86vm/XF86VMode.c
View file

@ -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

1
src/video/x11/SDL_x11dyn.c
View file

@ -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

9
src/video/x11/SDL_x11dyn.h
View file

@ -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);

2
src/video/x11/SDL_x11sym.h
View file

@ -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))