Skip to content

L
libSDL
Commit 635e991d authored by Ryan C. Gordon's avatar Ryan C. Gordon
Browse files
Options

More dynamic X11 mangling...should fix NetBSD builds. And hopefully doesn't 

 break 6 other platforms.  :)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401606
parent 29098a80
Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 65 deletions
include/SDL_config.h
View file @ 635e991d
/* include/SDL_config.h. Generated by configure. */
/* /*
SDL - Simple DirectMedia Layer SDL - Simple DirectMedia Layer
Copyright (C) 1997-2006 Sam Lantinga Copyright (C) 1997-2006 Sam Lantinga
...@@ -23,56 +24,280 @@ ...@@ -23,56 +24,280 @@
#ifndef _SDL_config_h #ifndef _SDL_config_h
#define _SDL_config_h #define _SDL_config_h
/* This is a set of defines to configure the SDL features */
/* General platform specific identifiers */
#include "SDL_platform.h" #include "SDL_platform.h"
/* Add any platform that doesn't build using the configure system */ /* C language features */
#if defined(__AMIGA__) /* #undef const */
#include "SDL_config_amiga.h" /* #undef inline */
#elif defined(__DREAMCAST__) /* #undef volatile */
#include "SDL_config_dreamcast.h"
#elif defined(__MACOS__) /* C datatypes */
#include "SDL_config_macos.h" /* #undef size_t */
#elif defined(__MACOSX__) /* #undef int8_t */
#include "SDL_config_macosx.h" /* #undef uint8_t */
#elif defined(__WIN32__) /* #undef int16_t */
#include "SDL_config_win32.h" /* #undef uint16_t */
#elif defined(__OS2__) /* #undef int32_t */
#include "SDL_config_os2.h" /* #undef uint32_t */
#else /* #undef int64_t */
/* This is the minimal configuration that can be used to build SDL */ /* #undef uint64_t */
/* #undef uintptr_t */
#define SDL_HAS_64BIT_TYPE 1
/* Endianness */
#define SDL_BYTEORDER 1234
/* Comment this if you want to build without any C library requirements */
#define HAVE_LIBC 1
#if HAVE_LIBC
/* Useful headers */
#define HAVE_ALLOCA_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_STDIO_H 1
#define STDC_HEADERS 1
#define HAVE_STDLIB_H 1
#define HAVE_STDARG_H 1
#define HAVE_MALLOC_H 1
#define HAVE_MEMORY_H 1
#define HAVE_STRING_H 1
#define HAVE_STRINGS_H 1
#define HAVE_INTTYPES_H 1
#define HAVE_STDINT_H 1
#define HAVE_CTYPE_H 1
#define HAVE_MATH_H 1
#define HAVE_ICONV_H 1
#define HAVE_SIGNAL_H 1
/* #undef HAVE_ALTIVEC_H */
/* C library functions */
#define HAVE_MALLOC 1
#define HAVE_CALLOC 1
#define HAVE_REALLOC 1
#define HAVE_FREE 1
#define HAVE_ALLOCA 1
#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
#define HAVE_GETENV 1
#define HAVE_PUTENV 1
#define HAVE_UNSETENV 1
#endif
#define HAVE_QSORT 1
#define HAVE_ABS 1
#define HAVE_BCOPY 1
#define HAVE_MEMSET 1
#define HAVE_MEMCPY 1
#define HAVE_MEMMOVE 1
#define HAVE_MEMCMP 1
#define HAVE_STRLEN 1
/* #undef HAVE_STRLCPY */
/* #undef HAVE_STRLCAT */
#define HAVE_STRDUP 1
/* #undef HAVE__STRREV */
/* #undef HAVE__STRUPR */
/* #undef HAVE__STRLWR */
/* #undef HAVE_INDEX */
/* #undef HAVE_RINDEX */
#define HAVE_STRCHR 1
#define HAVE_STRRCHR 1
#define HAVE_STRSTR 1
/* #undef HAVE_ITOA */
/* #undef HAVE__LTOA */
/* #undef HAVE__UITOA */
/* #undef HAVE__ULTOA */
#define HAVE_STRTOL 1
#define HAVE_STRTOUL 1
/* #undef HAVE__I64TOA */
/* #undef HAVE__UI64TOA */
#define HAVE_STRTOLL 1
#define HAVE_STRTOULL 1
#define HAVE_STRTOD 1
#define HAVE_ATOI 1
#define HAVE_ATOF 1
#define HAVE_STRCMP 1
#define HAVE_STRNCMP 1
/* #undef HAVE__STRICMP */
#define HAVE_STRCASECMP 1
/* #undef HAVE__STRNICMP */
#define HAVE_STRNCASECMP 1
#define HAVE_SSCANF 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
#define HAVE_ICONV 1
#define HAVE_SIGACTION 1
#define HAVE_SETJMP 1
#define HAVE_NANOSLEEP 1
/* #undef HAVE_CLOCK_GETTIME */
#define HAVE_DLVSYM 1
#else
/* We may need some replacement for stdarg.h here */
#include <stdarg.h> #include <stdarg.h>
#endif /* HAVE_LIBC */
/* Allow disabling of core subsystems */
/* #undef SDL_AUDIO_DISABLED */
/* #undef SDL_CDROM_DISABLED */
/* #undef SDL_CPUINFO_DISABLED */
/* #undef SDL_EVENTS_DISABLED */
/* #undef SDL_FILE_DISABLED */
/* #undef SDL_JOYSTICK_DISABLED */
/* #undef SDL_LOADSO_DISABLED */
/* #undef SDL_THREADS_DISABLED */
/* #undef SDL_TIMERS_DISABLED */
/* #undef SDL_VIDEO_DISABLED */
typedef signed char int8_t; /* Enable various audio drivers */
typedef unsigned char uint8_t; /* #undef SDL_AUDIO_DRIVER_AHI */
typedef signed short int16_t; #define SDL_AUDIO_DRIVER_ALSA 1
typedef unsigned short uint16_t; #define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
typedef signed int int32_t; /* #undef SDL_AUDIO_DRIVER_ARTS */
typedef unsigned int uint32_t; /* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
typedef unsigned int size_t; /* #undef SDL_AUDIO_DRIVER_BAUDIO */
typedef unsigned long uintptr_t; /* #undef SDL_AUDIO_DRIVER_BSD */
/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
/* #undef SDL_AUDIO_DRIVER_DART */
/* #undef SDL_AUDIO_DRIVER_DC */
#define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1
/* #undef SDL_AUDIO_DRIVER_DMEDIA */
/* #undef SDL_AUDIO_DRIVER_DSOUND */
/* #undef SDL_AUDIO_DRIVER_ESD */
/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_MINT */
/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
/* #undef SDL_AUDIO_DRIVER_NAS */
#define SDL_AUDIO_DRIVER_OSS 1
/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
/* #undef SDL_AUDIO_DRIVER_PAUD */
/* #undef SDL_AUDIO_DRIVER_QNXNTO */
/* #undef SDL_AUDIO_DRIVER_SNDMGR */
/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
/* Enable the dummy audio driver (src/audio/dummy/\*.c) */ /* Enable various cdrom drivers */
#define SDL_AUDIO_DRIVER_DUMMY 1 /* #undef SDL_CDROM_AIX */
/* #undef SDL_CDROM_BEOS */
/* #undef SDL_CDROM_BSDI */
/* #undef SDL_CDROM_DC */
/* #undef SDL_CDROM_DUMMY */
/* #undef SDL_CDROM_FREEBSD */
#define SDL_CDROM_LINUX 1
/* #undef SDL_CDROM_MACOS */
/* #undef SDL_CDROM_MACOSX */
/* #undef SDL_CDROM_MINT */
/* #undef SDL_CDROM_OPENBSD */
/* #undef SDL_CDROM_OS2 */
/* #undef SDL_CDROM_OSF */
/* #undef SDL_CDROM_QNX */
/* #undef SDL_CDROM_WIN32 */
/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */ /* Enable various input drivers */
#define SDL_CDROM_DISABLED 1 /* #undef SDL_INPUT_TSLIB */
/* #undef SDL_JOYSTICK_AMIGA */
/* #undef SDL_JOYSTICK_BEOS */
/* #undef SDL_JOYSTICK_DC */
/* #undef SDL_JOYSTICK_DUMMY */
/* #undef SDL_JOYSTICK_IOKIT */
#define SDL_JOYSTICK_LINUX 1
/* #undef SDL_JOYSTICK_LINUXEV */
/* #undef SDL_JOYSTICK_MACOS */
/* #undef SDL_JOYSTICK_MINT */
/* #undef SDL_JOYSTICK_OS2 */
/* #undef SDL_JOYSTICK_RISCOS */
/* #undef SDL_JOYSTICK_WINMM */
/* #undef SDL_JOYSTICK_USBHID */
/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ /* Enable various shared object loading systems */
#define SDL_JOYSTICK_DISABLED 1 /* #undef SDL_LOADSO_BEOS */
/* #undef SDL_LOADSO_DLCOMPAT */
#define SDL_LOADSO_DLOPEN 1
/* #undef SDL_LOADSO_LDG */
/* #undef SDL_LOADSO_MACOS */
/* #undef SDL_LOADSO_OS2 */
/* #undef SDL_LOADSO_WIN32 */
/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ /* Enable various threading systems */
#define SDL_LOADSO_DISABLED 1 /* #undef SDL_THREAD_AMIGA */
/* #undef SDL_THREAD_BEOS */
/* #undef SDL_THREAD_DC */
/* #undef SDL_THREAD_EPOC */
/* #undef SDL_THREAD_OS2 */
/* #undef SDL_THREAD_PTH */
#define SDL_THREAD_PTHREAD 1
#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
/* #undef SDL_THREAD_SPROC */
/* #undef SDL_THREAD_WIN32 */
/* Enable the stub thread support (src/thread/generic/\*.c) */ /* Enable various timer systems */
#define SDL_THREADS_DISABLED 1 /* #undef SDL_TIMER_AMIGA */
/* #undef SDL_TIMER_BEOS */
/* #undef SDL_TIMER_DC */
/* #undef SDL_TIMER_EPOC */
/* #undef SDL_TIMER_MACOS */
/* #undef SDL_TIMER_MINT */
/* #undef SDL_TIMER_OS2 */
/* #undef SDL_TIMER_RISCOS */
#define SDL_TIMER_UNIX 1
/* #undef SDL_TIMER_WIN32 */
/* #undef SDL_TIMER_WINCE */
/* Enable the stub timer support (src/timer/dummy/\*.c) */ /* Enable various video drivers */
#define SDL_TIMERS_DISABLED 1 /* #undef SDL_VIDEO_DRIVER_AALIB */
/* #undef SDL_VIDEO_DRIVER_BWINDOW */
/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */
/* #undef SDL_VIDEO_DRIVER_DC */
/* #undef SDL_VIDEO_DRIVER_DDRAW */
#define SDL_VIDEO_DRIVER_DGA 1
/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
#define SDL_VIDEO_DRIVER_DUMMY 1
/* #undef SDL_VIDEO_DRIVER_EPOC */
#define SDL_VIDEO_DRIVER_FBCON 1
/* #undef SDL_VIDEO_DRIVER_GAPI */
/* #undef SDL_VIDEO_DRIVER_GEM */
/* #undef SDL_VIDEO_DRIVER_GGI */
/* #undef SDL_VIDEO_DRIVER_IPOD */
/* #undef SDL_VIDEO_DRIVER_NANOX */
/* #undef SDL_VIDEO_DRIVER_OS2FS */
/* #undef SDL_VIDEO_DRIVER_PHOTON */
/* #undef SDL_VIDEO_DRIVER_PICOGUI */
/* #undef SDL_VIDEO_DRIVER_PS2GS */
/* #undef SDL_VIDEO_DRIVER_QTOPIA */
/* #undef SDL_VIDEO_DRIVER_QUARTZ */
/* #undef SDL_VIDEO_DRIVER_RISCOS */
/* #undef SDL_VIDEO_DRIVER_SVGALIB */
/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
/* #undef SDL_VIDEO_DRIVER_VGL */
/* #undef SDL_VIDEO_DRIVER_WINDIB */
/* #undef SDL_VIDEO_DRIVER_WSCONS */
#define SDL_VIDEO_DRIVER_X11 1
#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1"
#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
#define SDL_VIDEO_DRIVER_X11_XME 1
#define SDL_VIDEO_DRIVER_X11_XRANDR 1
#define SDL_VIDEO_DRIVER_X11_XV 1
/* #undef SDL_VIDEO_DRIVER_XBIOS */
/* Enable the dummy video driver (src/video/dummy/\*.c) */ /* Enable OpenGL support */
#define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_OPENGL 1
#define SDL_VIDEO_OPENGL_GLX 1
/* #undef SDL_VIDEO_OPENGL_WGL */
/* #undef SDL_VIDEO_OPENGL_OSMESA */
/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
#endif /* platform config */ /* Enable assembly routines */
#define SDL_ASSEMBLY_ROUTINES 1
/* #undef SDL_HERMES_BLITTERS */
/* #undef SDL_ALTIVEC_BLITTERS */
#endif /* _SDL_config_h */ #endif /* _SDL_config_h */
src/video/Xext/XME/xme.c
View file @ 635e991d
...@@ -14,13 +14,11 @@ ...@@ -14,13 +14,11 @@
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h" #include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include <X11/Xthreads.h> #include <X11/Xthreads.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/Xext.h> #include "../extensions/Xext.h"
#include "../extensions/extutil.h" #include "../extensions/extutil.h"
/*****************************************************************************/ /*****************************************************************************/
......
src/video/Xext/Xinerama/Xinerama.c
View file @ 635e991d
...@@ -28,11 +28,9 @@ Equipment Corporation. ...@@ -28,11 +28,9 @@ Equipment Corporation.
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h" #include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/Xext.h> /* in ../include */ #include "../extensions/Xext.h"
#include "../extensions/extutil.h" /* in ../include */ #include "../extensions/extutil.h" /* in ../include */
#include "../extensions/panoramiXext.h" #include "../extensions/panoramiXext.h"
#include "../extensions/panoramiXproto.h" /* in ../include */ #include "../extensions/panoramiXproto.h" /* in ../include */
......
src/video/Xext/Xv/Xv.c
View file @ 635e991d
...@@ -52,7 +52,7 @@ SOFTWARE. ...@@ -52,7 +52,7 @@ SOFTWARE.
#include <stdio.h> #include <stdio.h>
#include "Xvlibint.h" #include "Xvlibint.h"
#include <X11/extensions/Xext.h> #include "../extensions/Xext.h"
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include "../extensions/extutil.h" #include "../extensions/extutil.h"
......
src/video/Xext/Xv/Xvlibint.h
View file @ 635e991d
...@@ -43,9 +43,7 @@ SOFTWARE. ...@@ -43,9 +43,7 @@ SOFTWARE.
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h" #include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include "../extensions/Xvproto.h" #include "../extensions/Xvproto.h"
#include "../extensions/Xvlib.h" #include "../extensions/Xvlib.h"
......
src/video/Xext/Xxf86dga/XF86DGA.c
View file @ 635e991d
...@@ -59,12 +59,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc ...@@ -59,12 +59,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h" #include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include "../extensions/xf86dga.h" #include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h" #include "../extensions/xf86dgastr.h"
#include <X11/extensions/Xext.h> #include "../extensions/Xext.h"
#include "../extensions/extutil.h" #include "../extensions/extutil.h"
extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*); extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
......
src/video/Xext/Xxf86dga/XF86DGA2.c
View file @ 635e991d
...@@ -17,12 +17,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc ...@@ -17,12 +17,10 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h" #include <X11/Xlibint.h>
/*#include <X11/Xlibint.h>*/
#include "../extensions/xf86dga.h" #include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h" #include "../extensions/xf86dgastr.h"
#include <X11/extensions/Xext.h> #include "../extensions/Xext.h"
#include "../extensions/extutil.h" #include "../extensions/extutil.h"
#include <stdio.h> #include <stdio.h>
......
src/video/Xext/Xxf86vm/XF86VMode.c
View file @ 635e991d
...@@ -36,12 +36,10 @@ from Kaleb S. KEITHLEY. ...@@ -36,12 +36,10 @@ from Kaleb S. KEITHLEY.
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "../../x11/SDL_x11dyn.h"
#ifndef XBUILD_IN_CLIENT #ifndef XBUILD_IN_CLIENT
/*#include <X11/Xlibint.h>*/ #include <X11/Xlibint.h>
#include "../extensions/xf86vmstr.h" #include "../extensions/xf86vmstr.h"
#include <X11/extensions/Xext.h> #include "../extensions/Xext.h"
#include "../extensions/extutil.h" #include "../extensions/extutil.h"
#else #else
#include "lib/X11/Xlibint.h" #include "lib/X11/Xlibint.h"
......
src/video/Xext/extensions/Xext.h 0 → 100644
View file @ 635e991d
/*
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/include/extensions/Xext.h,v 1.7 2005/01/27 03:03:09 dawes Exp $ */
#ifndef _XEXT_H_
#define _XEXT_H_
#include <X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
typedef int (*XExtensionErrorHandler)(Display *, _Xconst char *,
_Xconst char *);
extern XExtensionErrorHandler XSetExtensionErrorHandler(
XExtensionErrorHandler handler
);
extern int XMissingExtension(
Display* /* dpy */,
_Xconst char* /* ext_name */
);
_XFUNCPROTOEND
#define X_EXTENSION_UNKNOWN "unknown"
#define X_EXTENSION_MISSING "missing"
#endif /* _XEXT_H_ */
src/video/Xext/extensions/extutil.h
View file @ 635e991d
...@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
#include "SDL_stdinc.h" /* For portable string functions */ #include "SDL_stdinc.h" /* For portable string functions */
#include <X11/extensions/Xext.h> #include "./Xext.h"
/* /*
* We need to keep a list of open displays since the Xlib display list isn't * We need to keep a list of open displays since the Xlib display list isn't
......
src/video/x11/SDL_x11dyn.h
View file @ 635e991d
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "../Xext/extensions/Xext.h"
#include "../Xext/extensions/extutil.h" #include "../Xext/extensions/extutil.h"
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
...@@ -60,7 +61,6 @@ extern "C" { ...@@ -60,7 +61,6 @@ extern "C" {
typedef Bool (*SDL_X11_XESetWireToEventRetType)(Display*,XEvent*,xEvent*); typedef Bool (*SDL_X11_XESetWireToEventRetType)(Display*,XEvent*,xEvent*);
typedef int (*SDL_X11_XSynchronizeRetType)(Display*); typedef int (*SDL_X11_XSynchronizeRetType)(Display*);
typedef Status (*SDL_X11_XESetEventToWireRetType)(Display*,XEvent*,xEvent*); typedef Status (*SDL_X11_XESetEventToWireRetType)(Display*,XEvent*,xEvent*);
typedef int (*SDL_X11_XSetExtensionErrorHandlerType)(Display *,char *,char *);
int SDL_X11_LoadSymbols(void); int SDL_X11_LoadSymbols(void);
void SDL_X11_UnloadSymbols(void); void SDL_X11_UnloadSymbols(void);
......
src/video/x11/SDL_x11sym.h
View file @ 635e991d
...@@ -126,7 +126,7 @@ SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display* a,xGenericReply* b),(a, ...@@ -126,7 +126,7 @@ SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display* a,xGenericReply* b),(a,
SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return) SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return) SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return) SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
SDL_X11_SYM(SDL_X11_XSetExtensionErrorHandlerType,XSetExtensionErrorHandler,(SDL_X11_XSetExtensionErrorHandlerType a),(a),return) SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
#if NeedWidePrototypes #if NeedWidePrototypes
SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return) SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment