More dynamic X11 mangling...should fix NetBSD builds. And hopefully doesn't
authorRyan C. Gordon <icculus@icculus.org>
Thu, 23 Mar 2006 08:43:37 +0000
changeset 1599ecba4bbaf9c2
parent 1598 5a6893ebc15a
child 1600 77bc91c8c16b
More dynamic X11 mangling...should fix NetBSD builds. And hopefully doesn't
break 6 other platforms. :)
include/SDL_config.h
src/video/Xext/XME/xme.c
src/video/Xext/Xinerama/Xinerama.c
src/video/Xext/Xv/Xv.c
src/video/Xext/Xv/Xvlibint.h
src/video/Xext/Xxf86dga/XF86DGA.c
src/video/Xext/Xxf86dga/XF86DGA2.c
src/video/Xext/Xxf86vm/XF86VMode.c
src/video/Xext/extensions/Xext.h
src/video/Xext/extensions/extutil.h
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11sym.h
     1.1 --- a/include/SDL_config.h	Thu Mar 23 08:37:36 2006 +0000
     1.2 +++ b/include/SDL_config.h	Thu Mar 23 08:43:37 2006 +0000
     1.3 @@ -1,3 +1,4 @@
     1.4 +/* include/SDL_config.h.  Generated by configure.  */
     1.5  /*
     1.6      SDL - Simple DirectMedia Layer
     1.7      Copyright (C) 1997-2006 Sam Lantinga
     1.8 @@ -23,56 +24,280 @@
     1.9  #ifndef _SDL_config_h
    1.10  #define _SDL_config_h
    1.11  
    1.12 +/* This is a set of defines to configure the SDL features */
    1.13 +
    1.14 +/* General platform specific identifiers */
    1.15  #include "SDL_platform.h"
    1.16  
    1.17 -/* Add any platform that doesn't build using the configure system */
    1.18 -#if defined(__AMIGA__)
    1.19 -#include "SDL_config_amiga.h"
    1.20 -#elif defined(__DREAMCAST__)
    1.21 -#include "SDL_config_dreamcast.h"
    1.22 -#elif defined(__MACOS__)
    1.23 -#include "SDL_config_macos.h"
    1.24 -#elif defined(__MACOSX__)
    1.25 -#include "SDL_config_macosx.h"
    1.26 -#elif defined(__WIN32__)
    1.27 -#include "SDL_config_win32.h"
    1.28 -#elif defined(__OS2__)
    1.29 -#include "SDL_config_os2.h"
    1.30 +/* C language features */
    1.31 +/* #undef const */
    1.32 +/* #undef inline */
    1.33 +/* #undef volatile */
    1.34 +
    1.35 +/* C datatypes */
    1.36 +/* #undef size_t */
    1.37 +/* #undef int8_t */
    1.38 +/* #undef uint8_t */
    1.39 +/* #undef int16_t */
    1.40 +/* #undef uint16_t */
    1.41 +/* #undef int32_t */
    1.42 +/* #undef uint32_t */
    1.43 +/* #undef int64_t */
    1.44 +/* #undef uint64_t */
    1.45 +/* #undef uintptr_t */
    1.46 +#define SDL_HAS_64BIT_TYPE 1
    1.47 +
    1.48 +/* Endianness */
    1.49 +#define SDL_BYTEORDER 1234
    1.50 +
    1.51 +/* Comment this if you want to build without any C library requirements */
    1.52 +#define HAVE_LIBC 1
    1.53 +#if HAVE_LIBC
    1.54 +
    1.55 +/* Useful headers */
    1.56 +#define HAVE_ALLOCA_H 1
    1.57 +#define HAVE_SYS_TYPES_H 1
    1.58 +#define HAVE_STDIO_H 1
    1.59 +#define STDC_HEADERS 1
    1.60 +#define HAVE_STDLIB_H 1
    1.61 +#define HAVE_STDARG_H 1
    1.62 +#define HAVE_MALLOC_H 1
    1.63 +#define HAVE_MEMORY_H 1
    1.64 +#define HAVE_STRING_H 1
    1.65 +#define HAVE_STRINGS_H 1
    1.66 +#define HAVE_INTTYPES_H 1
    1.67 +#define HAVE_STDINT_H 1
    1.68 +#define HAVE_CTYPE_H 1
    1.69 +#define HAVE_MATH_H 1
    1.70 +#define HAVE_ICONV_H 1
    1.71 +#define HAVE_SIGNAL_H 1
    1.72 +/* #undef HAVE_ALTIVEC_H */
    1.73 +
    1.74 +/* C library functions */
    1.75 +#define HAVE_MALLOC 1
    1.76 +#define HAVE_CALLOC 1
    1.77 +#define HAVE_REALLOC 1
    1.78 +#define HAVE_FREE 1
    1.79 +#define HAVE_ALLOCA 1
    1.80 +#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
    1.81 +#define HAVE_GETENV 1
    1.82 +#define HAVE_PUTENV 1
    1.83 +#define HAVE_UNSETENV 1
    1.84 +#endif
    1.85 +#define HAVE_QSORT 1
    1.86 +#define HAVE_ABS 1
    1.87 +#define HAVE_BCOPY 1
    1.88 +#define HAVE_MEMSET 1
    1.89 +#define HAVE_MEMCPY 1
    1.90 +#define HAVE_MEMMOVE 1
    1.91 +#define HAVE_MEMCMP 1
    1.92 +#define HAVE_STRLEN 1
    1.93 +/* #undef HAVE_STRLCPY */
    1.94 +/* #undef HAVE_STRLCAT */
    1.95 +#define HAVE_STRDUP 1
    1.96 +/* #undef HAVE__STRREV */
    1.97 +/* #undef HAVE__STRUPR */
    1.98 +/* #undef HAVE__STRLWR */
    1.99 +/* #undef HAVE_INDEX */
   1.100 +/* #undef HAVE_RINDEX */
   1.101 +#define HAVE_STRCHR 1
   1.102 +#define HAVE_STRRCHR 1
   1.103 +#define HAVE_STRSTR 1
   1.104 +/* #undef HAVE_ITOA */
   1.105 +/* #undef HAVE__LTOA */
   1.106 +/* #undef HAVE__UITOA */
   1.107 +/* #undef HAVE__ULTOA */
   1.108 +#define HAVE_STRTOL 1
   1.109 +#define HAVE_STRTOUL 1
   1.110 +/* #undef HAVE__I64TOA */
   1.111 +/* #undef HAVE__UI64TOA */
   1.112 +#define HAVE_STRTOLL 1
   1.113 +#define HAVE_STRTOULL 1
   1.114 +#define HAVE_STRTOD 1
   1.115 +#define HAVE_ATOI 1
   1.116 +#define HAVE_ATOF 1
   1.117 +#define HAVE_STRCMP 1
   1.118 +#define HAVE_STRNCMP 1
   1.119 +/* #undef HAVE__STRICMP */
   1.120 +#define HAVE_STRCASECMP 1
   1.121 +/* #undef HAVE__STRNICMP */
   1.122 +#define HAVE_STRNCASECMP 1
   1.123 +#define HAVE_SSCANF 1
   1.124 +#define HAVE_SNPRINTF 1
   1.125 +#define HAVE_VSNPRINTF 1
   1.126 +#define HAVE_ICONV 1
   1.127 +#define HAVE_SIGACTION 1
   1.128 +#define HAVE_SETJMP 1
   1.129 +#define HAVE_NANOSLEEP 1
   1.130 +/* #undef HAVE_CLOCK_GETTIME */
   1.131 +#define HAVE_DLVSYM 1
   1.132 +
   1.133  #else
   1.134 -/* This is the minimal configuration that can be used to build SDL */
   1.135 +/* We may need some replacement for stdarg.h here */
   1.136 +#include <stdarg.h>
   1.137 +#endif /* HAVE_LIBC */
   1.138  
   1.139 -#include <stdarg.h>
   1.140 +/* Allow disabling of core subsystems */
   1.141 +/* #undef SDL_AUDIO_DISABLED */
   1.142 +/* #undef SDL_CDROM_DISABLED */
   1.143 +/* #undef SDL_CPUINFO_DISABLED */
   1.144 +/* #undef SDL_EVENTS_DISABLED */
   1.145 +/* #undef SDL_FILE_DISABLED */
   1.146 +/* #undef SDL_JOYSTICK_DISABLED */
   1.147 +/* #undef SDL_LOADSO_DISABLED */
   1.148 +/* #undef SDL_THREADS_DISABLED */
   1.149 +/* #undef SDL_TIMERS_DISABLED */
   1.150 +/* #undef SDL_VIDEO_DISABLED */
   1.151  
   1.152 -typedef signed char int8_t;
   1.153 -typedef unsigned char uint8_t;
   1.154 -typedef signed short int16_t;
   1.155 -typedef unsigned short uint16_t;
   1.156 -typedef signed int int32_t;
   1.157 -typedef unsigned int uint32_t;
   1.158 -typedef unsigned int size_t;
   1.159 -typedef unsigned long uintptr_t;
   1.160 +/* Enable various audio drivers */
   1.161 +/* #undef SDL_AUDIO_DRIVER_AHI */
   1.162 +#define SDL_AUDIO_DRIVER_ALSA 1
   1.163 +#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
   1.164 +/* #undef SDL_AUDIO_DRIVER_ARTS */
   1.165 +/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
   1.166 +/* #undef SDL_AUDIO_DRIVER_BAUDIO */
   1.167 +/* #undef SDL_AUDIO_DRIVER_BSD */
   1.168 +/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
   1.169 +/* #undef SDL_AUDIO_DRIVER_DART */
   1.170 +/* #undef SDL_AUDIO_DRIVER_DC */
   1.171 +#define SDL_AUDIO_DRIVER_DISK 1
   1.172 +#define SDL_AUDIO_DRIVER_DUMMY 1
   1.173 +/* #undef SDL_AUDIO_DRIVER_DMEDIA */
   1.174 +/* #undef SDL_AUDIO_DRIVER_DSOUND */
   1.175 +/* #undef SDL_AUDIO_DRIVER_ESD */
   1.176 +/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   1.177 +/* #undef SDL_AUDIO_DRIVER_MINT */
   1.178 +/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
   1.179 +/* #undef SDL_AUDIO_DRIVER_NAS */
   1.180 +#define SDL_AUDIO_DRIVER_OSS 1
   1.181 +/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   1.182 +/* #undef SDL_AUDIO_DRIVER_PAUD */
   1.183 +/* #undef SDL_AUDIO_DRIVER_QNXNTO */
   1.184 +/* #undef SDL_AUDIO_DRIVER_SNDMGR */
   1.185 +/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   1.186 +/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
   1.187  
   1.188 -/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
   1.189 -#define SDL_AUDIO_DRIVER_DUMMY	1
   1.190 +/* Enable various cdrom drivers */
   1.191 +/* #undef SDL_CDROM_AIX */
   1.192 +/* #undef SDL_CDROM_BEOS */
   1.193 +/* #undef SDL_CDROM_BSDI */
   1.194 +/* #undef SDL_CDROM_DC */
   1.195 +/* #undef SDL_CDROM_DUMMY */
   1.196 +/* #undef SDL_CDROM_FREEBSD */
   1.197 +#define SDL_CDROM_LINUX 1
   1.198 +/* #undef SDL_CDROM_MACOS */
   1.199 +/* #undef SDL_CDROM_MACOSX */
   1.200 +/* #undef SDL_CDROM_MINT */
   1.201 +/* #undef SDL_CDROM_OPENBSD */
   1.202 +/* #undef SDL_CDROM_OS2 */
   1.203 +/* #undef SDL_CDROM_OSF */
   1.204 +/* #undef SDL_CDROM_QNX */
   1.205 +/* #undef SDL_CDROM_WIN32 */
   1.206  
   1.207 -/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
   1.208 -#define SDL_CDROM_DISABLED	1
   1.209 +/* Enable various input drivers */
   1.210 +/* #undef SDL_INPUT_TSLIB */
   1.211 +/* #undef SDL_JOYSTICK_AMIGA */
   1.212 +/* #undef SDL_JOYSTICK_BEOS */
   1.213 +/* #undef SDL_JOYSTICK_DC */
   1.214 +/* #undef SDL_JOYSTICK_DUMMY */
   1.215 +/* #undef SDL_JOYSTICK_IOKIT */
   1.216 +#define SDL_JOYSTICK_LINUX 1
   1.217 +/* #undef SDL_JOYSTICK_LINUXEV */
   1.218 +/* #undef SDL_JOYSTICK_MACOS */
   1.219 +/* #undef SDL_JOYSTICK_MINT */
   1.220 +/* #undef SDL_JOYSTICK_OS2 */
   1.221 +/* #undef SDL_JOYSTICK_RISCOS */
   1.222 +/* #undef SDL_JOYSTICK_WINMM */
   1.223 +/* #undef SDL_JOYSTICK_USBHID */
   1.224 +/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
   1.225 +
   1.226 +/* Enable various shared object loading systems */
   1.227 +/* #undef SDL_LOADSO_BEOS */
   1.228 +/* #undef SDL_LOADSO_DLCOMPAT */
   1.229 +#define SDL_LOADSO_DLOPEN 1
   1.230 +/* #undef SDL_LOADSO_LDG */
   1.231 +/* #undef SDL_LOADSO_MACOS */
   1.232 +/* #undef SDL_LOADSO_OS2 */
   1.233 +/* #undef SDL_LOADSO_WIN32 */
   1.234  
   1.235 -/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
   1.236 -#define SDL_JOYSTICK_DISABLED	1
   1.237 +/* Enable various threading systems */
   1.238 +/* #undef SDL_THREAD_AMIGA */
   1.239 +/* #undef SDL_THREAD_BEOS */
   1.240 +/* #undef SDL_THREAD_DC */
   1.241 +/* #undef SDL_THREAD_EPOC */
   1.242 +/* #undef SDL_THREAD_OS2 */
   1.243 +/* #undef SDL_THREAD_PTH */
   1.244 +#define SDL_THREAD_PTHREAD 1
   1.245 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   1.246 +/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   1.247 +/* #undef SDL_THREAD_SPROC */
   1.248 +/* #undef SDL_THREAD_WIN32 */
   1.249  
   1.250 -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
   1.251 -#define SDL_LOADSO_DISABLED	1
   1.252 +/* Enable various timer systems */
   1.253 +/* #undef SDL_TIMER_AMIGA */
   1.254 +/* #undef SDL_TIMER_BEOS */
   1.255 +/* #undef SDL_TIMER_DC */
   1.256 +/* #undef SDL_TIMER_EPOC */
   1.257 +/* #undef SDL_TIMER_MACOS */
   1.258 +/* #undef SDL_TIMER_MINT */
   1.259 +/* #undef SDL_TIMER_OS2 */
   1.260 +/* #undef SDL_TIMER_RISCOS */
   1.261 +#define SDL_TIMER_UNIX 1
   1.262 +/* #undef SDL_TIMER_WIN32 */
   1.263 +/* #undef SDL_TIMER_WINCE */
   1.264  
   1.265 -/* Enable the stub thread support (src/thread/generic/\*.c) */
   1.266 -#define SDL_THREADS_DISABLED	1
   1.267 +/* Enable various video drivers */
   1.268 +/* #undef SDL_VIDEO_DRIVER_AALIB */
   1.269 +/* #undef SDL_VIDEO_DRIVER_BWINDOW */
   1.270 +/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */
   1.271 +/* #undef SDL_VIDEO_DRIVER_DC */
   1.272 +/* #undef SDL_VIDEO_DRIVER_DDRAW */
   1.273 +#define SDL_VIDEO_DRIVER_DGA 1
   1.274 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   1.275 +/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
   1.276 +#define SDL_VIDEO_DRIVER_DUMMY 1
   1.277 +/* #undef SDL_VIDEO_DRIVER_EPOC */
   1.278 +#define SDL_VIDEO_DRIVER_FBCON 1
   1.279 +/* #undef SDL_VIDEO_DRIVER_GAPI */
   1.280 +/* #undef SDL_VIDEO_DRIVER_GEM */
   1.281 +/* #undef SDL_VIDEO_DRIVER_GGI */
   1.282 +/* #undef SDL_VIDEO_DRIVER_IPOD */
   1.283 +/* #undef SDL_VIDEO_DRIVER_NANOX */
   1.284 +/* #undef SDL_VIDEO_DRIVER_OS2FS */
   1.285 +/* #undef SDL_VIDEO_DRIVER_PHOTON */
   1.286 +/* #undef SDL_VIDEO_DRIVER_PICOGUI */
   1.287 +/* #undef SDL_VIDEO_DRIVER_PS2GS */
   1.288 +/* #undef SDL_VIDEO_DRIVER_QTOPIA */
   1.289 +/* #undef SDL_VIDEO_DRIVER_QUARTZ */
   1.290 +/* #undef SDL_VIDEO_DRIVER_RISCOS */
   1.291 +/* #undef SDL_VIDEO_DRIVER_SVGALIB */
   1.292 +/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
   1.293 +/* #undef SDL_VIDEO_DRIVER_VGL */
   1.294 +/* #undef SDL_VIDEO_DRIVER_WINDIB */
   1.295 +/* #undef SDL_VIDEO_DRIVER_WSCONS */
   1.296 +#define SDL_VIDEO_DRIVER_X11 1
   1.297 +#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
   1.298 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
   1.299 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
   1.300 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
   1.301 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1"
   1.302 +#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
   1.303 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   1.304 +#define SDL_VIDEO_DRIVER_X11_XME 1
   1.305 +#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   1.306 +#define SDL_VIDEO_DRIVER_X11_XV 1
   1.307 +/* #undef SDL_VIDEO_DRIVER_XBIOS */
   1.308  
   1.309 -/* Enable the stub timer support (src/timer/dummy/\*.c) */
   1.310 -#define SDL_TIMERS_DISABLED	1
   1.311 +/* Enable OpenGL support */
   1.312 +#define SDL_VIDEO_OPENGL 1
   1.313 +#define SDL_VIDEO_OPENGL_GLX 1
   1.314 +/* #undef SDL_VIDEO_OPENGL_WGL */
   1.315 +/* #undef SDL_VIDEO_OPENGL_OSMESA */
   1.316 +/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   1.317  
   1.318 -/* Enable the dummy video driver (src/video/dummy/\*.c) */
   1.319 -#define SDL_VIDEO_DRIVER_DUMMY	1
   1.320 -
   1.321 -#endif /* platform config */
   1.322 +/* Enable assembly routines */
   1.323 +#define SDL_ASSEMBLY_ROUTINES 1
   1.324 +/* #undef SDL_HERMES_BLITTERS */
   1.325 +/* #undef SDL_ALTIVEC_BLITTERS */
   1.326  
   1.327  #endif /* _SDL_config_h */
     2.1 --- a/src/video/Xext/XME/xme.c	Thu Mar 23 08:37:36 2006 +0000
     2.2 +++ b/src/video/Xext/XME/xme.c	Thu Mar 23 08:43:37 2006 +0000
     2.3 @@ -14,13 +14,11 @@
     2.4  #define NEED_EVENTS
     2.5  #define NEED_REPLIES
     2.6  
     2.7 -#include "../../x11/SDL_x11dyn.h"
     2.8 -
     2.9 -/*#include <X11/Xlibint.h>*/
    2.10 +#include <X11/Xlibint.h>
    2.11  #include <X11/Xthreads.h>
    2.12  #include <X11/Xmd.h>
    2.13  #include <X11/Xproto.h>
    2.14 -#include <X11/extensions/Xext.h>
    2.15 +#include "../extensions/Xext.h"
    2.16  #include "../extensions/extutil.h"
    2.17  
    2.18  /*****************************************************************************/
     3.1 --- a/src/video/Xext/Xinerama/Xinerama.c	Thu Mar 23 08:37:36 2006 +0000
     3.2 +++ b/src/video/Xext/Xinerama/Xinerama.c	Thu Mar 23 08:43:37 2006 +0000
     3.3 @@ -28,11 +28,9 @@
     3.4  #define NEED_EVENTS
     3.5  #define NEED_REPLIES
     3.6  
     3.7 -#include "../../x11/SDL_x11dyn.h"
     3.8 -
     3.9 -/*#include <X11/Xlibint.h>*/
    3.10 +#include <X11/Xlibint.h>
    3.11  #include <X11/Xutil.h>
    3.12 -#include <X11/extensions/Xext.h>	/* in ../include */
    3.13 +#include "../extensions/Xext.h"
    3.14  #include "../extensions/extutil.h"			/* in ../include */
    3.15  #include "../extensions/panoramiXext.h"
    3.16  #include "../extensions/panoramiXproto.h"		/* in ../include */
     4.1 --- a/src/video/Xext/Xv/Xv.c	Thu Mar 23 08:37:36 2006 +0000
     4.2 +++ b/src/video/Xext/Xv/Xv.c	Thu Mar 23 08:43:37 2006 +0000
     4.3 @@ -52,7 +52,7 @@
     4.4  
     4.5  #include <stdio.h>
     4.6  #include "Xvlibint.h"
     4.7 -#include <X11/extensions/Xext.h>
     4.8 +#include "../extensions/Xext.h"
     4.9  #include <X11/extensions/XShm.h>
    4.10  #include "../extensions/extutil.h"
    4.11  
     5.1 --- a/src/video/Xext/Xv/Xvlibint.h	Thu Mar 23 08:37:36 2006 +0000
     5.2 +++ b/src/video/Xext/Xv/Xvlibint.h	Thu Mar 23 08:43:37 2006 +0000
     5.3 @@ -43,9 +43,7 @@
     5.4  
     5.5  #define NEED_REPLIES
     5.6  
     5.7 -#include "../../x11/SDL_x11dyn.h"
     5.8 -
     5.9 -/*#include <X11/Xlibint.h>*/
    5.10 +#include <X11/Xlibint.h>
    5.11  #include "../extensions/Xvproto.h"
    5.12  #include "../extensions/Xvlib.h"
    5.13  
     6.1 --- a/src/video/Xext/Xxf86dga/XF86DGA.c	Thu Mar 23 08:37:36 2006 +0000
     6.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Thu Mar 23 08:43:37 2006 +0000
     6.3 @@ -59,12 +59,10 @@
     6.4  #define NEED_EVENTS
     6.5  #define NEED_REPLIES
     6.6  
     6.7 -#include "../../x11/SDL_x11dyn.h"
     6.8 -
     6.9 -/*#include <X11/Xlibint.h>*/
    6.10 +#include <X11/Xlibint.h>
    6.11  #include "../extensions/xf86dga.h"
    6.12  #include "../extensions/xf86dgastr.h"
    6.13 -#include <X11/extensions/Xext.h>
    6.14 +#include "../extensions/Xext.h"
    6.15  #include "../extensions/extutil.h"
    6.16  
    6.17  extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
     7.1 --- a/src/video/Xext/Xxf86dga/XF86DGA2.c	Thu Mar 23 08:37:36 2006 +0000
     7.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA2.c	Thu Mar 23 08:43:37 2006 +0000
     7.3 @@ -17,12 +17,10 @@
     7.4  #define NEED_EVENTS
     7.5  #define NEED_REPLIES
     7.6  
     7.7 -#include "../../x11/SDL_x11dyn.h"
     7.8 -
     7.9 -/*#include <X11/Xlibint.h>*/
    7.10 +#include <X11/Xlibint.h>
    7.11  #include "../extensions/xf86dga.h"
    7.12  #include "../extensions/xf86dgastr.h"
    7.13 -#include <X11/extensions/Xext.h>
    7.14 +#include "../extensions/Xext.h"
    7.15  #include "../extensions/extutil.h"
    7.16  #include <stdio.h>
    7.17  
     8.1 --- a/src/video/Xext/Xxf86vm/XF86VMode.c	Thu Mar 23 08:37:36 2006 +0000
     8.2 +++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Thu Mar 23 08:43:37 2006 +0000
     8.3 @@ -36,12 +36,10 @@
     8.4  #define NEED_EVENTS
     8.5  #define NEED_REPLIES
     8.6  
     8.7 -#include "../../x11/SDL_x11dyn.h"
     8.8 -
     8.9  #ifndef XBUILD_IN_CLIENT
    8.10 -/*#include <X11/Xlibint.h>*/
    8.11 +#include <X11/Xlibint.h>
    8.12  #include "../extensions/xf86vmstr.h"
    8.13 -#include <X11/extensions/Xext.h>
    8.14 +#include "../extensions/Xext.h"
    8.15  #include "../extensions/extutil.h"
    8.16  #else
    8.17  #include "lib/X11/Xlibint.h"
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/src/video/Xext/extensions/Xext.h	Thu Mar 23 08:43:37 2006 +0000
     9.3 @@ -0,0 +1,50 @@
     9.4 +/*
     9.5 +Copyright 1989, 1998  The Open Group
     9.6 +
     9.7 +Permission to use, copy, modify, distribute, and sell this software and its
     9.8 +documentation for any purpose is hereby granted without fee, provided that
     9.9 +the above copyright notice appear in all copies and that both that
    9.10 +copyright notice and this permission notice appear in supporting
    9.11 +documentation.
    9.12 +
    9.13 +The above copyright notice and this permission notice shall be included in
    9.14 +all copies or substantial portions of the Software.
    9.15 +
    9.16 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    9.17 +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    9.18 +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
    9.19 +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
    9.20 +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    9.21 +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    9.22 +
    9.23 +Except as contained in this notice, the name of The Open Group shall not be
    9.24 +used in advertising or otherwise to promote the sale, use or other dealings
    9.25 +in this Software without prior written authorization from The Open Group.
    9.26 + */
    9.27 +/* $XFree86: xc/include/extensions/Xext.h,v 1.7 2005/01/27 03:03:09 dawes Exp $ */
    9.28 +
    9.29 +#ifndef _XEXT_H_
    9.30 +#define _XEXT_H_
    9.31 +
    9.32 +#include <X11/Xfuncproto.h>
    9.33 +
    9.34 +_XFUNCPROTOBEGIN
    9.35 +
    9.36 +typedef int (*XExtensionErrorHandler)(Display *, _Xconst char *,
    9.37 +				      _Xconst char *);
    9.38 +
    9.39 +extern XExtensionErrorHandler XSetExtensionErrorHandler(
    9.40 +	XExtensionErrorHandler handler
    9.41 +);
    9.42 +
    9.43 +extern int XMissingExtension(
    9.44 +    Display*		/* dpy */,
    9.45 +    _Xconst char*	/* ext_name */
    9.46 +);
    9.47 +
    9.48 +_XFUNCPROTOEND
    9.49 +
    9.50 +#define X_EXTENSION_UNKNOWN "unknown"
    9.51 +#define X_EXTENSION_MISSING "missing"
    9.52 +
    9.53 +#endif /* _XEXT_H_ */
    10.1 --- a/src/video/Xext/extensions/extutil.h	Thu Mar 23 08:37:36 2006 +0000
    10.2 +++ b/src/video/Xext/extensions/extutil.h	Thu Mar 23 08:43:37 2006 +0000
    10.3 @@ -38,7 +38,7 @@
    10.4  
    10.5  #include "SDL_stdinc.h"		/* For portable string functions */
    10.6  
    10.7 -#include <X11/extensions/Xext.h>
    10.8 +#include "./Xext.h"
    10.9  
   10.10  /*
   10.11   * We need to keep a list of open displays since the Xlib display list isn't
    11.1 --- a/src/video/x11/SDL_x11dyn.h	Thu Mar 23 08:37:36 2006 +0000
    11.2 +++ b/src/video/x11/SDL_x11dyn.h	Thu Mar 23 08:43:37 2006 +0000
    11.3 @@ -30,6 +30,7 @@
    11.4  #include <X11/Xlibint.h>
    11.5  #include <X11/Xproto.h>
    11.6  
    11.7 +#include "../Xext/extensions/Xext.h"
    11.8  #include "../Xext/extensions/extutil.h"
    11.9  
   11.10  #ifndef NO_SHARED_MEMORY
   11.11 @@ -60,7 +61,6 @@
   11.12  typedef Bool (*SDL_X11_XESetWireToEventRetType)(Display*,XEvent*,xEvent*);
   11.13  typedef int (*SDL_X11_XSynchronizeRetType)(Display*);
   11.14  typedef Status (*SDL_X11_XESetEventToWireRetType)(Display*,XEvent*,xEvent*);
   11.15 -typedef int (*SDL_X11_XSetExtensionErrorHandlerType)(Display *,char *,char *);
   11.16  
   11.17  int SDL_X11_LoadSymbols(void);
   11.18  void SDL_X11_UnloadSymbols(void);
    12.1 --- a/src/video/x11/SDL_x11sym.h	Thu Mar 23 08:37:36 2006 +0000
    12.2 +++ b/src/video/x11/SDL_x11sym.h	Thu Mar 23 08:43:37 2006 +0000
    12.3 @@ -126,7 +126,7 @@
    12.4  SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
    12.5  SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
    12.6  SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
    12.7 -SDL_X11_SYM(SDL_X11_XSetExtensionErrorHandlerType,XSetExtensionErrorHandler,(SDL_X11_XSetExtensionErrorHandlerType a),(a),return)
    12.8 +SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
    12.9  
   12.10  #if NeedWidePrototypes
   12.11  SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)