From 9ccb93c3f2fcfa57749a35bff4476338a1b78cc9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 12 Mar 2011 13:21:57 -0800 Subject: [PATCH] Fixed so code will compile with SDL_config_minimal.h --- include/SDL_config_minimal.h | 10 +++++++++- include/SDL_stdinc.h | 5 +---- src/audio/pulseaudio/SDL_pulseaudio.c | 5 ++++- src/thread/pthread/SDL_sysmutex.c | 2 +- src/video/x11/SDL_x11clipboard.c | 4 ++++ src/video/x11/SDL_x11dyn.c | 4 ++++ src/video/x11/SDL_x11events.c | 4 ++++ src/video/x11/SDL_x11framebuffer.c | 4 ++++ src/video/x11/SDL_x11keyboard.c | 4 ++++ src/video/x11/SDL_x11modes.c | 4 ++++ src/video/x11/SDL_x11mouse.c | 4 ++++ src/video/x11/SDL_x11shape.c | 6 ++++++ src/video/x11/SDL_x11touch.c | 5 +++++ src/video/x11/SDL_x11video.c | 4 ++++ src/video/x11/SDL_x11window.c | 4 ++++ 15 files changed, 62 insertions(+), 7 deletions(-) diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h index 3dd3059a9..7eb76c6e6 100644 --- a/include/SDL_config_minimal.h +++ b/include/SDL_config_minimal.h @@ -31,19 +31,27 @@ * This is the minimal configuration that can be used to build SDL. */ +#include #include #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) +typedef unsigned int size_t; typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed short int16_t; typedef unsigned short uint16_t; typedef signed int int32_t; typedef unsigned int uint32_t; -typedef unsigned int size_t; +typedef signed long long int64_t; +typedef unsigned long long uint64_t; typedef unsigned long uintptr_t; #endif /* !_STDINT_H_ && !HAVE_STDINT_H */ +#define SDL_HAS_64BIT_TYPE +#ifdef __GNUC__ +#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1 +#endif + /* Enable the dummy audio driver (src/audio/dummy/\*.c) */ #define SDL_AUDIO_DRIVER_DUMMY 1 diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index 9f134c703..4d896bac5 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -174,10 +174,7 @@ SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); -#if !defined(__NINTENDODS__) && !defined(__ANDROID__) -/* TODO: figure out why the following happens: - include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative - include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */ +#ifdef SDL_HAS_64BIT_TYPE SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); #endif diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c index cb0e3cf02..62aa45ef8 100644 --- a/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/src/audio/pulseaudio/SDL_pulseaudio.c @@ -26,9 +26,10 @@ was the cleanest way to move it to 1.3. The 1.2 target was written by Stéphan Kochen: stephan .a.t. kochen.nl */ - #include "SDL_config.h" +#if SDL_AUDIO_DRIVER_PULSEAUDIO + /* Allow access to a raw mixing buffer */ #ifdef HAVE_SIGNAL_H @@ -505,4 +506,6 @@ AudioBootStrap PULSEAUDIO_bootstrap = { PULSEAUDIO_DRIVER_NAME, "PulseAudio", PULSEAUDIO_Init, 0 }; +#endif /* SDL_AUDIO_DRIVER_PULSEAUDIO */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/thread/pthread/SDL_sysmutex.c b/src/thread/pthread/SDL_sysmutex.c index 9cfac6874..d7ba0e8d7 100644 --- a/src/thread/pthread/SDL_sysmutex.c +++ b/src/thread/pthread/SDL_sysmutex.c @@ -28,7 +28,7 @@ #if !SDL_THREAD_PTHREAD_RECURSIVE_MUTEX && \ !SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP -#define FAKE_RECURSIVE_MUTEX +#define FAKE_RECURSIVE_MUTEX 1 #endif struct SDL_mutex diff --git a/src/video/x11/SDL_x11clipboard.c b/src/video/x11/SDL_x11clipboard.c index e503cae2d..34093ab57 100644 --- a/src/video/x11/SDL_x11clipboard.c +++ b/src/video/x11/SDL_x11clipboard.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include /* For INT_MAX */ #include "SDL_events.h" @@ -149,4 +151,6 @@ X11_HasClipboardText(_THIS) return retval; } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c index 96072dad0..4ecb8527e 100644 --- a/src/video/x11/SDL_x11dyn.c +++ b/src/video/x11/SDL_x11dyn.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #define DEBUG_DYNAMIC_X11 0 #include "SDL_x11dyn.h" @@ -206,4 +208,6 @@ SDL_X11_LoadSymbols(void) return rc; } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index 320586f18..646c58ca2 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include #include #include @@ -637,4 +639,6 @@ X11_SuspendScreenSaver(_THIS) #endif } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11framebuffer.c b/src/video/x11/SDL_x11framebuffer.c index c11b918f0..8309c24bb 100644 --- a/src/video/x11/SDL_x11framebuffer.c +++ b/src/video/x11/SDL_x11framebuffer.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include "SDL_x11video.h" #include "SDL_x11framebuffer.h" @@ -211,4 +213,6 @@ X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window) } } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c index af2adfcfd..a9c438194 100644 --- a/src/video/x11/SDL_x11keyboard.c +++ b/src/video/x11/SDL_x11keyboard.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include "SDL_x11video.h" #include "../../events/SDL_keyboard_c.h" @@ -287,4 +289,6 @@ X11_QuitKeyboard(_THIS) { } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c index 847a8fe4e..a553f8c44 100644 --- a/src/video/x11/SDL_x11modes.c +++ b/src/video/x11/SDL_x11modes.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include "SDL_x11video.h" /*#define X11MODES_DEBUG*/ @@ -715,4 +717,6 @@ X11_QuitModes(_THIS) { } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c index 448de7ac5..d14d3e86f 100644 --- a/src/video/x11/SDL_x11mouse.c +++ b/src/video/x11/SDL_x11mouse.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include "SDL_assert.h" #include "SDL_x11video.h" #include "SDL_x11mouse.h" @@ -293,4 +295,6 @@ X11_QuitMouse(_THIS) X11_DestroyEmptyCursor(); } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11shape.c b/src/video/x11/SDL_x11shape.c index 74ee903a8..1c2531f50 100644 --- a/src/video/x11/SDL_x11shape.c +++ b/src/video/x11/SDL_x11shape.c @@ -19,6 +19,9 @@ Eli Gottlieb eligottlieb@gmail.com */ +#include "SDL_config.h" + +#if SDL_VIDEO_DRIVER_X11 #include "SDL_assert.h" #include "SDL_x11video.h" @@ -108,3 +111,6 @@ X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMo return 0; } + +#endif /* SDL_VIDEO_DRIVER_X11 */ + diff --git a/src/video/x11/SDL_x11touch.c b/src/video/x11/SDL_x11touch.c index 8b43f626a..99c04492d 100644 --- a/src/video/x11/SDL_x11touch.c +++ b/src/video/x11/SDL_x11touch.c @@ -20,6 +20,9 @@ slouken@libsdl.org */ #include "SDL_config.h" + +#if SDL_VIDEO_DRIVER_X11 + #include "SDL_x11video.h" #include "SDL_x11touch.h" #include "../../events/SDL_touch_c.h" @@ -117,4 +120,6 @@ X11_QuitTouch(_THIS) SDL_TouchQuit(); } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index efbc7f2c9..ab211b48f 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include /* For getpid() and readlink() */ #include "SDL_video.h" @@ -390,4 +392,6 @@ X11_UseDirectColorVisuals(void) return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE; } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vim: set ts=4 sw=4 expandtab: */ diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c index 4160f3914..6b25ab47c 100644 --- a/src/video/x11/SDL_x11window.c +++ b/src/video/x11/SDL_x11window.c @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#if SDL_VIDEO_DRIVER_X11 + #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" #include "../../events/SDL_keyboard_c.h" @@ -1084,4 +1086,6 @@ X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) } } +#endif /* SDL_VIDEO_DRIVER_X11 */ + /* vi: set ts=4 sw=4 expandtab: */