From 63f4244a4213e6d76015f863ae926ab43fbb2a6a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 10 Feb 2006 06:48:43 +0000 Subject: [PATCH] More header massaging... works great on Windows. ;-) --- include/SDL.h | 14 ++- include/SDL_active.h | 1 + include/SDL_audio.h | 4 +- include/SDL_cdrom.h | 1 + include/SDL_config.h | 115 ++----------------- include/SDL_events.h | 1 + include/SDL_joystick.h | 1 + include/SDL_keyboard.h | 1 + include/SDL_loadso.h | 1 + include/SDL_mouse.h | 1 + include/SDL_mutex.h | 1 + include/SDL_quit.h | 1 + include/SDL_rwops.h | 1 + include/SDL_stdlib.h | 23 ---- include/SDL_string.h | 23 ---- include/SDL_syswm.h | 1 + include/SDL_thread.h | 1 + include/SDL_timer.h | 1 + include/SDL_video.h | 2 +- src/SDL.c | 2 - src/SDL_error.c | 3 - src/audio/SDL_audio.c | 4 - src/audio/SDL_audiocvt.c | 1 - src/audio/SDL_audiodev.c | 6 +- src/audio/SDL_audiomem.c | 2 +- src/audio/SDL_mixer.c | 6 +- src/audio/SDL_wave.c | 4 - src/audio/alsa/SDL_alsa_audio.c | 3 - src/audio/amigaos/SDL_ahiaudio.c | 3 - src/audio/arts/SDL_artsaudio.c | 5 +- src/audio/baudio/SDL_beaudio.cc | 2 - src/audio/dart/SDL_dart.c | 4 - src/audio/dc/SDL_dcaudio.c | 5 +- src/audio/disk/SDL_diskaudio.c | 5 +- src/audio/dma/SDL_dmaaudio.c | 5 +- src/audio/dmedia/SDL_irixaudio.c | 3 - src/audio/dsp/SDL_dspaudio.c | 5 +- src/audio/esd/SDL_esdaudio.c | 5 +- src/audio/macosx/SDL_coreaudio.c | 3 - src/audio/macrom/SDL_romaudio.c | 3 - src/audio/mint/SDL_mintaudio.c | 3 - src/audio/mint/SDL_mintaudio_dma8.c | 3 - src/audio/mint/SDL_mintaudio_gsxb.c | 3 - src/audio/mint/SDL_mintaudio_mcsn.c | 3 - src/audio/mint/SDL_mintaudio_stfa.c | 3 - src/audio/mint/SDL_mintaudio_xbios.c | 3 - src/audio/mme/SDL_mmeaudio.c | 5 +- src/audio/nas/SDL_nasaudio.c | 5 +- src/audio/nto/SDL_nto_audio.c | 5 +- src/audio/openbsd/SDL_openbsdaudio.c | 5 +- src/audio/paudio/SDL_paudio.c | 5 +- src/audio/sun/SDL_sunaudio.c | 5 +- src/audio/ums/SDL_umsaudio.c | 3 - src/audio/windib/SDL_dibaudio.c | 5 +- src/audio/windx5/SDL_dx5audio.c | 4 - src/cdrom/SDL_cdrom.c | 3 - src/cdrom/aix/SDL_syscdrom.c | 3 - src/cdrom/beos/SDL_syscdrom.cc | 3 - src/cdrom/bsdi/SDL_syscdrom.c | 3 - src/cdrom/dc/SDL_syscdrom.c | 1 - src/cdrom/freebsd/SDL_syscdrom.c | 3 - src/cdrom/linux/SDL_syscdrom.c | 3 - src/cdrom/macosx/SDLOSXCAGuard.c | 3 +- src/cdrom/mint/SDL_syscdrom.c | 2 - src/cdrom/openbsd/SDL_syscdrom.c | 3 - src/cdrom/os2/SDL_syscdrom.c | 3 - src/cdrom/osf/SDL_syscdrom.c | 3 - src/cdrom/qnx/SDL_syscdrom.c | 5 +- src/cdrom/win32/SDL_syscdrom.c | 3 - src/events/SDL_active.c | 1 - src/events/SDL_events.c | 4 - src/events/SDL_keyboard.c | 4 +- src/events/SDL_mouse.c | 1 - src/file/SDL_rwops.c | 1 - src/joystick/SDL_joystick.c | 3 - src/joystick/amigaos/SDL_sysjoystick.c | 2 - src/joystick/beos/SDL_bejoystick.cc | 3 - src/joystick/bsd/SDL_sysjoystick.c | 3 - src/joystick/darwin/SDL_sysjoystick.c | 1 - src/joystick/dc/SDL_sysjoystick.c | 3 - src/joystick/dummy/SDL_sysjoystick.c | 3 - src/joystick/linux/SDL_sysjoystick.c | 3 - src/joystick/macos/SDL_sysjoystick.c | 3 - src/joystick/mint/SDL_sysjoystick.c | 5 - src/joystick/os2/SDL_sysjoystick.c | 3 - src/joystick/riscos/SDL_sysjoystick.c | 3 - src/joystick/win32/SDL_mmjoystick.c | 11 +- src/loadso/beos/SDL_loadso.c | 2 - src/loadso/dlopen/SDL_loadso.c | 2 - src/loadso/dummy/SDL_loadso.c | 2 - src/loadso/macos/SDL_loadso.c | 2 - src/loadso/macosx/SDL_loadso.c | 5 +- src/loadso/mint/SDL_loadso.c | 2 - src/loadso/os2/SDL_loadso.c | 2 - src/loadso/windows/SDL_loadso.c | 2 - src/main/beos/exports/Makefile | 3 - src/main/macos/exports/Makefile | 3 - src/main/macosx/exports/Makefile | 3 - src/main/win32/SDL_win32_main.c | 3 - src/main/win32/exports/Makefile | 3 - src/stdlib/SDL_getenv.c | 1 - src/stdlib/SDL_string.c | 10 +- src/thread/SDL_thread.c | 3 - src/thread/amigaos/SDL_syssem.c | 1 - src/thread/amigaos/SDL_systhread.c | 1 - src/thread/amigaos/SDL_thread.c | 3 - src/thread/beos/SDL_syssem.c | 1 - src/thread/beos/SDL_systhread.c | 1 - src/thread/bsdi/SDL_syssem.c | 2 - src/thread/dc/SDL_syscond.c | 2 - src/thread/dc/SDL_sysmutex.c | 2 - src/thread/dc/SDL_syssem.c | 1 - src/thread/dc/SDL_systhread.c | 1 - src/thread/generic/SDL_syscond.c | 2 - src/thread/generic/SDL_sysmutex.c | 2 - src/thread/generic/SDL_syssem.c | 2 - src/thread/generic/SDL_systhread.c | 1 - src/thread/irix/SDL_systhread.c | 1 - src/thread/linux/SDL_syscond.c | 2 - src/thread/linux/SDL_sysmutex.c | 2 - src/thread/linux/SDL_syssem.c | 2 - src/thread/linux/SDL_systhread.c | 2 - src/thread/os2/SDL_syscond.c | 2 - src/thread/os2/SDL_sysmutex.c | 2 - src/thread/os2/SDL_syssem.c | 2 - src/thread/os2/SDL_systhread.c | 2 - src/thread/pth/SDL_syscond.c | 2 - src/thread/pth/SDL_sysmutex.c | 2 - src/thread/pth/SDL_systhread.c | 1 - src/thread/riscos/SDL_syscond.c | 2 - src/thread/riscos/SDL_sysmutex.c | 2 - src/thread/riscos/SDL_syssem.c | 2 - src/thread/riscos/SDL_systhread.c | 1 - src/thread/win32/SDL_sysmutex.c | 2 - src/thread/win32/SDL_syssem.c | 2 - src/thread/win32/SDL_systhread.c | 2 - src/timer/SDL_timer.c | 2 - src/timer/amigaos/SDL_systimer.c | 1 - src/timer/beos/SDL_systimer.c | 1 - src/timer/dc/SDL_systimer.c | 1 - src/timer/linux/SDL_systimer.c | 1 - src/timer/mint/SDL_systimer.c | 1 - src/timer/os2/SDL_systimer.c | 1 - src/timer/riscos/SDL_systimer.c | 1 - src/timer/win32/SDL_systimer.c | 1 - src/timer/wince/SDL_systimer.c | 1 - src/video/SDL_RLEaccel.c | 4 - src/video/SDL_blit.c | 2 - src/video/SDL_blit_0.c | 2 - src/video/SDL_blit_1.c | 1 - src/video/SDL_blit_A.c | 1 - src/video/SDL_blit_N.c | 6 +- src/video/SDL_bmp.c | 2 - src/video/SDL_cursor.c | 3 - src/video/SDL_gamma.c | 3 - src/video/SDL_pixels.c | 3 - src/video/SDL_stretch.c | 1 - src/video/SDL_surface.c | 3 - src/video/SDL_video.c | 6 - src/video/SDL_yuv.c | 3 - src/video/SDL_yuv_mmx.c | 3 +- src/video/SDL_yuv_sw.c | 3 - src/video/aalib/SDL_aamouse.c | 1 - src/video/aalib/SDL_aavideo.c | 4 - src/video/ataricommon/SDL_ataric2p_s.h | 2 +- src/video/ataricommon/SDL_atarievents.c | 3 - src/video/ataricommon/SDL_atarigl.c | 5 +- src/video/ataricommon/SDL_atarimxalloc.c | 2 +- src/video/ataricommon/SDL_biosevents.c | 2 - src/video/ataricommon/SDL_gemdosevents.c | 2 - src/video/ataricommon/SDL_ikbdevents.c | 2 - src/video/ataricommon/SDL_ikbdinterrupt_s.h | 2 +- src/video/ataricommon/SDL_xbiosinterrupt_s.h | 2 +- src/video/bwindow/SDL_sysmouse.cc | 3 - src/video/bwindow/SDL_sysvideo.cc | 3 - src/video/bwindow/SDL_sysyuv.cc | 2 - src/video/cybergfx/SDL_amigamouse.c | 1 - src/video/cybergfx/SDL_cgxaccel.c | 3 +- src/video/cybergfx/SDL_cgxgl.c | 1 - src/video/cybergfx/SDL_cgximage.c | 3 - src/video/cybergfx/SDL_cgxmodes.c | 1 - src/video/cybergfx/SDL_cgxvideo.c | 4 +- src/video/cybergfx/SDL_cgxvideo.h | 2 - src/video/cybergfx/SDL_cgxwm.c | 1 - src/video/cybergfx/SDL_cgxyuv.c | 3 - src/video/dc/SDL_dcmouse.c | 1 - src/video/dc/SDL_dcvideo.c | 4 - src/video/dga/SDL_dgamouse.c | 1 - src/video/dga/SDL_dgavideo.c | 4 - src/video/directfb/SDL_DirectFB_video.c | 4 - src/video/directfb/SDL_DirectFB_yuv.c | 2 - src/video/dummy/SDL_nullmouse.c | 3 - src/video/dummy/SDL_nullvideo.c | 4 - src/video/epoc/SDL_epocvideo.cpp | 3 - src/video/fbcon/SDL_fb3dfx.c | 1 - src/video/fbcon/SDL_fbelo.c | 3 +- src/video/fbcon/SDL_fbevents.c | 3 - src/video/fbcon/SDL_fbmatrox.c | 1 - src/video/fbcon/SDL_fbmouse.c | 3 - src/video/fbcon/SDL_fbriva.c | 1 - src/video/fbcon/SDL_fbvideo.c | 4 - src/video/gapi/SDL_gapivideo.c | 3 - src/video/gem/SDL_gemevents.c | 2 - src/video/gem/SDL_gemmouse.c | 2 - src/video/gem/SDL_gemvideo.c | 6 +- src/video/ggi/SDL_ggimouse.c | 3 - src/video/ggi/SDL_ggivideo.c | 4 - src/video/ipod/SDL_ipodvideo.c | 4 - src/video/maccommon/SDL_macevents.c | 1 - src/video/maccommon/SDL_macgl.c | 1 - src/video/maccommon/SDL_macmouse.c | 3 - src/video/maccommon/SDL_macwm.c | 2 +- src/video/macdsp/SDL_dspvideo.c | 3 - src/video/macrom/SDL_romvideo.c | 3 - src/video/nanox/SDL_nximage.c | 4 - src/video/nanox/SDL_nxmodes.c | 3 +- src/video/nanox/SDL_nxmouse.c | 2 - src/video/nanox/SDL_nxvideo.c | 4 +- src/video/nanox/SDL_nxwm.c | 1 - src/video/os2fslib/SDL_os2fslib.c | 4 - src/video/photon/SDL_ph_image.c | 4 - src/video/photon/SDL_ph_modes.c | 1 - src/video/photon/SDL_ph_mouse.c | 3 - src/video/photon/SDL_ph_video.c | 6 +- src/video/photon/SDL_ph_wm.c | 2 - src/video/photon/SDL_phyuv.c | 3 - src/video/picogui/SDL_pgvideo.c | 4 - src/video/ps2gs/SDL_gsevents.c | 2 - src/video/ps2gs/SDL_gsmouse.c | 1 - src/video/ps2gs/SDL_gsvideo.c | 4 - src/video/ps2gs/SDL_gsyuv.c | 3 - src/video/qtopia/SDL_sysvideo.cc | 3 - src/video/quartz/SDL_QuartzEvents.m | 1 - src/video/riscos/SDL_riscosFullScreenVideo.c | 4 - src/video/riscos/SDL_riscosmouse.c | 2 - src/video/riscos/SDL_riscossprite.c | 2 +- src/video/riscos/SDL_riscostask.c | 3 +- src/video/riscos/SDL_riscosvideo.c | 6 +- src/video/riscos/SDL_wimpvideo.c | 4 - src/video/svga/SDL_svgaevents.c | 3 - src/video/svga/SDL_svgamouse.c | 3 - src/video/svga/SDL_svgavideo.c | 4 - src/video/vgl/SDL_vglmouse.c | 3 - src/video/vgl/SDL_vglvideo.c | 4 - src/video/wincommon/SDL_sysevents.c | 4 - src/video/wincommon/SDL_sysmouse.c | 3 - src/video/wincommon/SDL_syswm.c | 3 - src/video/wincommon/SDL_wingl.c | 3 - src/video/windib/SDL_dibevents.c | 4 +- src/video/windib/SDL_dibvideo.c | 4 - src/video/windx5/SDL_dx5events.c | 4 +- src/video/windx5/SDL_dx5video.c | 4 - src/video/windx5/SDL_dx5yuv.c | 3 - src/video/wscons/SDL_wsconsmouse.c | 3 - src/video/wscons/SDL_wsconsvideo.c | 4 - src/video/x11/SDL_x11dga.c | 2 - src/video/x11/SDL_x11events.c | 2 - src/video/x11/SDL_x11gl.c | 3 - src/video/x11/SDL_x11image.c | 3 - src/video/x11/SDL_x11modes.c | 3 - src/video/x11/SDL_x11mouse.c | 3 - src/video/x11/SDL_x11video.c | 6 +- src/video/x11/SDL_x11wm.c | 3 - src/video/x11/SDL_x11yuv.c | 3 - src/video/xbios/SDL_xbios.c | 4 - src/video/xbios/SDL_xbios.h | 2 +- src/video/xbios/SDL_xbios_centscreen.c | 2 - src/video/xbios/SDL_xbios_sb3.c | 2 +- 268 files changed, 90 insertions(+), 806 deletions(-) delete mode 100644 include/SDL_stdlib.h delete mode 100644 include/SDL_string.h diff --git a/include/SDL.h b/include/SDL.h index 27aba2b30..eb3044789 100644 --- a/include/SDL.h +++ b/include/SDL.h @@ -26,16 +26,18 @@ #define _SDL_H #include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_rwops.h" -#include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_cdrom.h" -#include "SDL_joystick.h" +#include "SDL_cpuinfo.h" +#include "SDL_endian.h" +#include "SDL_error.h" #include "SDL_events.h" -#include "SDL_video.h" #include "SDL_loadso.h" -#include "SDL_byteorder.h" +#include "SDL_mutex.h" +#include "SDL_rwops.h" +#include "SDL_thread.h" +#include "SDL_timer.h" +#include "SDL_video.h" #include "SDL_version.h" #include "begin_code.h" diff --git a/include/SDL_active.h b/include/SDL_active.h index bf822338a..2cf474c5a 100644 --- a/include/SDL_active.h +++ b/include/SDL_active.h @@ -26,6 +26,7 @@ #define _SDL_active_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_audio.h b/include/SDL_audio.h index a10c0e021..68ec4759d 100644 --- a/include/SDL_audio.h +++ b/include/SDL_audio.h @@ -27,8 +27,10 @@ #include "SDL_stdinc.h" #include "SDL_error.h" -#include "SDL_rwops.h" #include "SDL_endian.h" +#include "SDL_mutex.h" +#include "SDL_thread.h" +#include "SDL_rwops.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_cdrom.h b/include/SDL_cdrom.h index 59944bf8b..5f8f0c62a 100644 --- a/include/SDL_cdrom.h +++ b/include/SDL_cdrom.h @@ -26,6 +26,7 @@ #define _SDL_cdrom_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_config.h b/include/SDL_config.h index ff1975d2e..67aaa63cc 100644 --- a/include/SDL_config.h +++ b/include/SDL_config.h @@ -1,4 +1,3 @@ -/* include/SDL_config.h. Generated by configure. */ /* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga @@ -24,111 +23,17 @@ #ifndef _SDL_config_h #define _SDL_config_h -/* This is a set of defines to configure the SDL features */ +/* This is the minimal configuration that can be used to build SDL */ -/* C language features */ -/* #undef const */ -/* #undef inline */ -/* #undef volatile */ +#include -/* C datatypes */ -/* #undef size_t */ -/* #undef int8_t */ -/* #undef uint8_t */ -/* #undef int16_t */ -/* #undef uint16_t */ -/* #undef int32_t */ -/* #undef uint32_t */ -#define SDL_HAS_64BIT_TYPE 1 -/* #undef int64_t */ -/* #undef uint64_t */ -/* #undef uintptr_t */ - -/* Endianness */ -#define SDL_BYTEORDER 1234 - -/* Comment this if you want to build without any C library requirements */ -#define HAVE_LIBC 1 -#ifdef HAVE_LIBC - -/* Useful headers */ -#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_SIGNAL_H 1 - -/* 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 -#define HAVE_STRCPY 1 -#define HAVE_STRNCPY 1 -#define HAVE_STRCAT 1 -#define HAVE_STRNCAT 1 -#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 -/* #undef HAVE__I64TOA */ -/* #undef HAVE__UI64TOA */ -#define HAVE_STRTOLL 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 -#define HAVE_SSCANF 1 -#define HAVE_SNPRINTF 1 -/* #undef HAVE_VSNPRINTF */ - -#endif /* HAVE_LIBC */ - - -/* Allow disabling of core subsystems */ -/* #undef DISABLE_AUDIO */ -/* #undef DISABLE_VIDEO */ -/* #undef DISABLE_EVENTS */ -/* #undef DISABLE_JOYSTICK */ -/* #undef DISABLE_CDROM */ -/* #undef DISABLE_THREADS */ -/* #undef DISABLE_TIMERS */ -/* #undef DISABLE_FILE */ -/* #undef DISABLE_CPUINFO */ +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 unsigned long uintptr_t; #endif /* _SDL_config_h */ diff --git a/include/SDL_events.h b/include/SDL_events.h index 4321d0457..9fe918c7b 100644 --- a/include/SDL_events.h +++ b/include/SDL_events.h @@ -26,6 +26,7 @@ #define _SDL_events_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "SDL_active.h" #include "SDL_keyboard.h" #include "SDL_mouse.h" diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h index e0f904ab8..e4f72f1a4 100644 --- a/include/SDL_joystick.h +++ b/include/SDL_joystick.h @@ -26,6 +26,7 @@ #define _SDL_joystick_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_keyboard.h b/include/SDL_keyboard.h index f99deacf5..1e9635897 100644 --- a/include/SDL_keyboard.h +++ b/include/SDL_keyboard.h @@ -26,6 +26,7 @@ #define _SDL_keyboard_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "SDL_keysym.h" #include "begin_code.h" diff --git a/include/SDL_loadso.h b/include/SDL_loadso.h index 35d0db5ff..ce9644949 100644 --- a/include/SDL_loadso.h +++ b/include/SDL_loadso.h @@ -42,6 +42,7 @@ #define _SDL_loadso_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_mouse.h b/include/SDL_mouse.h index 33c445db5..c2364d859 100644 --- a/include/SDL_mouse.h +++ b/include/SDL_mouse.h @@ -26,6 +26,7 @@ #define _SDL_mouse_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "SDL_video.h" #include "begin_code.h" diff --git a/include/SDL_mutex.h b/include/SDL_mutex.h index cecb205c3..00165281d 100644 --- a/include/SDL_mutex.h +++ b/include/SDL_mutex.h @@ -29,6 +29,7 @@ */ #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_quit.h b/include/SDL_quit.h index b0a8003f5..fcf40fbdd 100644 --- a/include/SDL_quit.h +++ b/include/SDL_quit.h @@ -26,6 +26,7 @@ #define _SDL_quit_h #include "SDL_stdinc.h" +#include "SDL_error.h" /* An SDL_QUITEVENT is generated when the user tries to close the application diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index 05a088edd..f5d96d283 100644 --- a/include/SDL_rwops.h +++ b/include/SDL_rwops.h @@ -28,6 +28,7 @@ #define _SDL_RWops_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_stdlib.h b/include/SDL_stdlib.h deleted file mode 100644 index d913d8cbc..000000000 --- a/include/SDL_stdlib.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2006 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#include "SDL_stdinc.h" diff --git a/include/SDL_string.h b/include/SDL_string.h deleted file mode 100644 index d913d8cbc..000000000 --- a/include/SDL_string.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2006 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#include "SDL_stdinc.h" diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 6992669f6..2f74735b7 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -26,6 +26,7 @@ #define _SDL_syswm_h #include "SDL_stdinc.h" +#include "SDL_error.h" #include "SDL_version.h" #include "begin_code.h" diff --git a/include/SDL_thread.h b/include/SDL_thread.h index 3c0826f59..24a95fb32 100644 --- a/include/SDL_thread.h +++ b/include/SDL_thread.h @@ -29,6 +29,7 @@ */ #include "SDL_stdinc.h" +#include "SDL_error.h" /* Thread synchronization primitives */ #include "SDL_mutex.h" diff --git a/include/SDL_timer.h b/include/SDL_timer.h index 22c49c3a1..d21159fed 100644 --- a/include/SDL_timer.h +++ b/include/SDL_timer.h @@ -26,6 +26,7 @@ /* Header for the SDL time management routines */ #include "SDL_stdinc.h" +#include "SDL_error.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_video.h b/include/SDL_video.h index 24e7e759b..f47697107 100644 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -26,7 +26,7 @@ #define _SDL_video_h #include "SDL_stdinc.h" -#include "SDL_mutex.h" +#include "SDL_error.h" #include "SDL_rwops.h" #include "begin_code.h" diff --git a/src/SDL.c b/src/SDL.c index 120ea54a8..dd0c0ef4c 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -27,8 +27,6 @@ #endif #include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_endian.h" #include "SDL_fatal.h" #ifndef DISABLE_VIDEO #include "SDL_leaks.h" diff --git a/src/SDL_error.c b/src/SDL_error.c index f0b59ec4b..c0cde54db 100644 --- a/src/SDL_error.c +++ b/src/SDL_error.c @@ -22,9 +22,6 @@ /* Simple error handling in SDL */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_types.h" #include "SDL_error.h" #include "SDL_error_c.h" #ifndef DISABLE_THREADS diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index 911ab9578..dc66eb39a 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -23,10 +23,6 @@ /* Allow access to a raw mixing buffer */ #include "SDL.h" -#include "SDL_audio.h" -#include "SDL_timer.h" -#include "SDL_error.h" -#include "SDL_string.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" #include "SDL_sysaudio.h" diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c index 61e81192b..8141e6217 100644 --- a/src/audio/SDL_audiocvt.c +++ b/src/audio/SDL_audiocvt.c @@ -22,7 +22,6 @@ /* Functions for audio drivers to perform runtime conversion of audio format */ -#include "SDL_error.h" #include "SDL_audio.h" diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c index 41e5c7d1e..59db59197 100644 --- a/src/audio/SDL_audiodev.c +++ b/src/audio/SDL_audiodev.c @@ -28,8 +28,7 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_audiodev_c.h" #ifndef _PATH_DEV_DSP @@ -103,8 +102,7 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic) #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_audiodev_c.h" #ifndef _PATH_DEV_DSP diff --git a/src/audio/SDL_audiomem.c b/src/audio/SDL_audiomem.c index 3e93aa1aa..03f3cfc5c 100644 --- a/src/audio/SDL_audiomem.c +++ b/src/audio/SDL_audiomem.c @@ -31,7 +31,7 @@ #include #endif -#include "SDL_stdlib.h" +#include "SDL_stdinc.h" #include "SDL_audiomem.h" /* Allocate memory that will be shared between threads (freed on exit) */ diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c index 702698906..5a55f849b 100644 --- a/src/audio/SDL_mixer.c +++ b/src/audio/SDL_mixer.c @@ -22,12 +22,10 @@ /* This provides the default mixing callback for the SDL audio routines */ -#include "SDL_audio.h" -#include "SDL_mutex.h" -#include "SDL_timer.h" #include "SDL_cpuinfo.h" +#include "SDL_timer.h" +#include "SDL_audio.h" #include "SDL_sysaudio.h" -#include "SDL_cpuinfo.h" #include "SDL_mixer_MMX.h" #include "SDL_mixer_MMX_VC.h" #include "SDL_mixer_m68k.h" diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c index e2ecf14d6..f76d78c65 100644 --- a/src/audio/SDL_wave.c +++ b/src/audio/SDL_wave.c @@ -24,12 +24,8 @@ /* Microsoft WAVE file loading routines */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_audio.h" #include "SDL_wave.h" -#include "SDL_endian.h" static int ReadChunk(SDL_RWops *src, Chunk *chunk); diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c index b36aa5f58..08c7abb7c 100644 --- a/src/audio/alsa/SDL_alsa_audio.c +++ b/src/audio/alsa/SDL_alsa_audio.c @@ -27,10 +27,7 @@ #include #include /* For kill() */ -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" #include "SDL_timer.h" diff --git a/src/audio/amigaos/SDL_ahiaudio.c b/src/audio/amigaos/SDL_ahiaudio.c index 3b7d61013..0130e66c7 100644 --- a/src/audio/amigaos/SDL_ahiaudio.c +++ b/src/audio/amigaos/SDL_ahiaudio.c @@ -22,9 +22,6 @@ /* Allow access to a raw mixing buffer (for AmigaOS) */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c index e7342385b..68b14ae18 100644 --- a/src/audio/arts/SDL_artsaudio.c +++ b/src/audio/arts/SDL_artsaudio.c @@ -22,13 +22,10 @@ /* Allow access to a raw mixing buffer */ -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_artsaudio.h" diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc index c53483c18..29ab97f4d 100644 --- a/src/audio/baudio/SDL_beaudio.cc +++ b/src/audio/baudio/SDL_beaudio.cc @@ -28,8 +28,6 @@ extern "C" { -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_sysaudio.h" diff --git a/src/audio/dart/SDL_dart.c b/src/audio/dart/SDL_dart.c index 7d1c1f3cd..f1d3b3e4f 100644 --- a/src/audio/dart/SDL_dart.c +++ b/src/audio/dart/SDL_dart.c @@ -22,10 +22,6 @@ /* Allow access to a raw mixing buffer */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_audio_c.h" diff --git a/src/audio/dc/SDL_dcaudio.c b/src/audio/dc/SDL_dcaudio.c index 4550df10a..41f5efd63 100644 --- a/src/audio/dc/SDL_dcaudio.c +++ b/src/audio/dc/SDL_dcaudio.c @@ -30,13 +30,10 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_dcaudio.h" diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c index 504e6b342..6b6af41bb 100644 --- a/src/audio/disk/SDL_diskaudio.c +++ b/src/audio/disk/SDL_diskaudio.c @@ -35,13 +35,10 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_diskaudio.h" diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c index 1c8aaf084..6cdb7592d 100644 --- a/src/audio/dma/SDL_dmaaudio.c +++ b/src/audio/dma/SDL_dmaaudio.c @@ -45,13 +45,10 @@ #define MAP_FAILED ((Uint8 *)-1) #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_dmaaudio.h" diff --git a/src/audio/dmedia/SDL_irixaudio.c b/src/audio/dmedia/SDL_irixaudio.c index 47574f0cd..632ee98cf 100644 --- a/src/audio/dmedia/SDL_irixaudio.c +++ b/src/audio/dmedia/SDL_irixaudio.c @@ -23,9 +23,6 @@ /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */ /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_audiomem.h" diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c index d2e9a2a0f..dd424f54d 100644 --- a/src/audio/dsp/SDL_dspaudio.c +++ b/src/audio/dsp/SDL_dspaudio.c @@ -42,13 +42,10 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_dspaudio.h" diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c index cb3cdac24..3445d5b38 100644 --- a/src/audio/esd/SDL_esdaudio.c +++ b/src/audio/esd/SDL_esdaudio.c @@ -28,13 +28,10 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_esdaudio.h" diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c index af7fe0823..1f8e9bd8d 100644 --- a/src/audio/macosx/SDL_coreaudio.c +++ b/src/audio/macosx/SDL_coreaudio.c @@ -22,9 +22,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c index 4b97b4bc7..d88f9f600 100644 --- a/src/audio/macrom/SDL_romaudio.c +++ b/src/audio/macrom/SDL_romaudio.c @@ -39,9 +39,6 @@ #endif #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mint/SDL_mintaudio.c b/src/audio/mint/SDL_mintaudio.c index 2c9adfceb..39e29e320 100644 --- a/src/audio/mint/SDL_mintaudio.c +++ b/src/audio/mint/SDL_mintaudio.c @@ -32,10 +32,7 @@ #include #include -#include "SDL_types.h" #include "SDL_audio.h" -#include "SDL_string.h" - #include "SDL_mintaudio.h" #include "SDL_mintaudio_stfa.h" diff --git a/src/audio/mint/SDL_mintaudio_dma8.c b/src/audio/mint/SDL_mintaudio_dma8.c index 21a1fda78..f8379d649 100644 --- a/src/audio/mint/SDL_mintaudio_dma8.c +++ b/src/audio/mint/SDL_mintaudio_dma8.c @@ -32,9 +32,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mint/SDL_mintaudio_gsxb.c b/src/audio/mint/SDL_mintaudio_gsxb.c index 91f4d4178..4719a5bcc 100644 --- a/src/audio/mint/SDL_mintaudio_gsxb.c +++ b/src/audio/mint/SDL_mintaudio_gsxb.c @@ -32,9 +32,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c index e1baa79ce..c3229ae31 100644 --- a/src/audio/mint/SDL_mintaudio_mcsn.c +++ b/src/audio/mint/SDL_mintaudio_mcsn.c @@ -34,9 +34,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mint/SDL_mintaudio_stfa.c b/src/audio/mint/SDL_mintaudio_stfa.c index 63dc32562..ab905edf0 100644 --- a/src/audio/mint/SDL_mintaudio_stfa.c +++ b/src/audio/mint/SDL_mintaudio_stfa.c @@ -32,9 +32,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c index 191b62b90..1b96b43d0 100644 --- a/src/audio/mint/SDL_mintaudio_xbios.c +++ b/src/audio/mint/SDL_mintaudio_xbios.c @@ -35,9 +35,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" #include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_audiomem.h" diff --git a/src/audio/mme/SDL_mmeaudio.c b/src/audio/mme/SDL_mmeaudio.c index 2f8c332cb..f48b4435a 100644 --- a/src/audio/mme/SDL_mmeaudio.c +++ b/src/audio/mme/SDL_mmeaudio.c @@ -23,11 +23,8 @@ /* Tru64 UNIX MME support */ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_audio.h" -#include "SDL_mutex.h" #include "SDL_timer.h" +#include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_mmeaudio.h" diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c index b227f2978..af4f59221 100644 --- a/src/audio/nas/SDL_nasaudio.c +++ b/src/audio/nas/SDL_nasaudio.c @@ -29,13 +29,10 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_nasaudio.h" diff --git a/src/audio/nto/SDL_nto_audio.c b/src/audio/nto/SDL_nto_audio.c index 69585a665..fc9982fa6 100644 --- a/src/audio/nto/SDL_nto_audio.c +++ b/src/audio/nto/SDL_nto_audio.c @@ -31,13 +31,10 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_nto_audio.h" /* The tag name used by NTO audio */ diff --git a/src/audio/openbsd/SDL_openbsdaudio.c b/src/audio/openbsd/SDL_openbsdaudio.c index 5e61f9af1..08cfaf170 100644 --- a/src/audio/openbsd/SDL_openbsdaudio.c +++ b/src/audio/openbsd/SDL_openbsdaudio.c @@ -34,13 +34,10 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_openbsdaudio.h" diff --git a/src/audio/paudio/SDL_paudio.c b/src/audio/paudio/SDL_paudio.c index b175f5610..ca261c8b4 100644 --- a/src/audio/paudio/SDL_paudio.c +++ b/src/audio/paudio/SDL_paudio.c @@ -31,13 +31,10 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audiomem.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" #include "SDL_audiodev_c.h" #include "SDL_paudio.h" diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c index 1c48edd59..e6b961c4c 100644 --- a/src/audio/sun/SDL_sunaudio.c +++ b/src/audio/sun/SDL_sunaudio.c @@ -36,15 +36,12 @@ #endif #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_endian.h" +#include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_audiomem.h" #include "SDL_audiodev_c.h" #include "SDL_sunaudio.h" #include "SDL_audio_c.h" -#include "SDL_timer.h" /* Open the audio device for playback, and don't block if busy */ #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) diff --git a/src/audio/ums/SDL_umsaudio.c b/src/audio/ums/SDL_umsaudio.c index 639dc2fa2..ba88633fa 100644 --- a/src/audio/ums/SDL_umsaudio.c +++ b/src/audio/ums/SDL_umsaudio.c @@ -33,10 +33,7 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_audio.h" -#include "SDL_error.h" #include "SDL_audio_c.h" #include "SDL_audiodev_c.h" #include "SDL_umsaudio.h" diff --git a/src/audio/windib/SDL_dibaudio.c b/src/audio/windib/SDL_dibaudio.c index 2e0afaedd..4f3acc934 100644 --- a/src/audio/windib/SDL_dibaudio.c +++ b/src/audio/windib/SDL_dibaudio.c @@ -25,11 +25,8 @@ #include "SDL_windows.h" #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_audio.h" -#include "SDL_mutex.h" #include "SDL_timer.h" +#include "SDL_audio.h" #include "SDL_audio_c.h" #include "SDL_dibaudio.h" #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) diff --git a/src/audio/windx5/SDL_dx5audio.c b/src/audio/windx5/SDL_dx5audio.c index a75cb64a9..2a64a769c 100644 --- a/src/audio/windx5/SDL_dx5audio.c +++ b/src/audio/windx5/SDL_dx5audio.c @@ -22,10 +22,6 @@ /* Allow access to a raw mixing buffer */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_audio_c.h" diff --git a/src/cdrom/SDL_cdrom.c b/src/cdrom/SDL_cdrom.c index b9c8625d3..ae9dbb527 100644 --- a/src/cdrom/SDL_cdrom.c +++ b/src/cdrom/SDL_cdrom.c @@ -22,9 +22,6 @@ /* This is the CD-audio control API for Simple DirectMedia Layer */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/aix/SDL_syscdrom.c b/src/cdrom/aix/SDL_syscdrom.c index 00c0013c0..c7799241d 100644 --- a/src/cdrom/aix/SDL_syscdrom.c +++ b/src/cdrom/aix/SDL_syscdrom.c @@ -40,9 +40,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/beos/SDL_syscdrom.cc b/src/cdrom/beos/SDL_syscdrom.cc index 5f9c3ebee..da97d031e 100644 --- a/src/cdrom/beos/SDL_syscdrom.cc +++ b/src/cdrom/beos/SDL_syscdrom.cc @@ -33,9 +33,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" extern "C" { #include "SDL_syscdrom.h" diff --git a/src/cdrom/bsdi/SDL_syscdrom.c b/src/cdrom/bsdi/SDL_syscdrom.c index 602ad7c65..5a466e002 100644 --- a/src/cdrom/bsdi/SDL_syscdrom.c +++ b/src/cdrom/bsdi/SDL_syscdrom.c @@ -37,9 +37,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/dc/SDL_syscdrom.c b/src/cdrom/dc/SDL_syscdrom.c index 64bee2016..8b56cd894 100644 --- a/src/cdrom/dc/SDL_syscdrom.c +++ b/src/cdrom/dc/SDL_syscdrom.c @@ -25,7 +25,6 @@ #include #include -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/freebsd/SDL_syscdrom.c b/src/cdrom/freebsd/SDL_syscdrom.c index 5154d25d1..b54d643b5 100644 --- a/src/cdrom/freebsd/SDL_syscdrom.c +++ b/src/cdrom/freebsd/SDL_syscdrom.c @@ -29,9 +29,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/linux/SDL_syscdrom.c b/src/cdrom/linux/SDL_syscdrom.c index 2ec7f7e76..e035f7f24 100644 --- a/src/cdrom/linux/SDL_syscdrom.c +++ b/src/cdrom/linux/SDL_syscdrom.c @@ -81,9 +81,6 @@ #endif #endif /* USE_MNTENT */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/macosx/SDLOSXCAGuard.c b/src/cdrom/macosx/SDLOSXCAGuard.c index 163a1ef4d..33b3c6197 100644 --- a/src/cdrom/macosx/SDLOSXCAGuard.c +++ b/src/cdrom/macosx/SDLOSXCAGuard.c @@ -73,8 +73,7 @@ #include #include */ -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" //#define NDEBUG 1 /* diff --git a/src/cdrom/mint/SDL_syscdrom.c b/src/cdrom/mint/SDL_syscdrom.c index 56cdfb592..9d7791100 100644 --- a/src/cdrom/mint/SDL_syscdrom.c +++ b/src/cdrom/mint/SDL_syscdrom.c @@ -31,9 +31,7 @@ #include #include -#include "SDL_error.h" #include "SDL_cdrom.h" -#include "SDL_string.h" #include "SDL_syscdrom.h" /* Some ioctl() errno values which occur when the tray is empty */ diff --git a/src/cdrom/openbsd/SDL_syscdrom.c b/src/cdrom/openbsd/SDL_syscdrom.c index 5c57fadc4..3d66b46eb 100644 --- a/src/cdrom/openbsd/SDL_syscdrom.c +++ b/src/cdrom/openbsd/SDL_syscdrom.c @@ -31,9 +31,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/os2/SDL_syscdrom.c b/src/cdrom/os2/SDL_syscdrom.c index c1922a004..bb83ebbc9 100644 --- a/src/cdrom/os2/SDL_syscdrom.c +++ b/src/cdrom/os2/SDL_syscdrom.c @@ -26,9 +26,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/osf/SDL_syscdrom.c b/src/cdrom/osf/SDL_syscdrom.c index 930de4e04..ddd46b560 100644 --- a/src/cdrom/osf/SDL_syscdrom.c +++ b/src/cdrom/osf/SDL_syscdrom.c @@ -32,9 +32,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/cdrom/qnx/SDL_syscdrom.c b/src/cdrom/qnx/SDL_syscdrom.c index 8dc5bd520..065cc7eaa 100644 --- a/src/cdrom/qnx/SDL_syscdrom.c +++ b/src/cdrom/qnx/SDL_syscdrom.c @@ -31,11 +31,8 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" -#include "SDL_cdrom.h" #include "SDL_timer.h" +#include "SDL_cdrom.h" #include "SDL_syscdrom.h" /* The maximum number of CD-ROM drives we'll detect */ diff --git a/src/cdrom/win32/SDL_syscdrom.c b/src/cdrom/win32/SDL_syscdrom.c index 4f70a72ce..283d32d46 100644 --- a/src/cdrom/win32/SDL_syscdrom.c +++ b/src/cdrom/win32/SDL_syscdrom.c @@ -25,9 +25,6 @@ #include "SDL_windows.h" #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_cdrom.h" #include "SDL_syscdrom.h" diff --git a/src/events/SDL_active.c b/src/events/SDL_active.c index 2a02db804..91aea5c1d 100644 --- a/src/events/SDL_active.c +++ b/src/events/SDL_active.c @@ -23,7 +23,6 @@ /* Application focus/iconification handling code for SDL */ #include "SDL_events.h" -#include "SDL_string.h" #include "SDL_events_c.h" diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index 07bd21adc..bce9d4194 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -23,10 +23,6 @@ /* General event handling code for SDL */ #include "SDL.h" -#include "SDL_thread.h" -#include "SDL_mutex.h" -#include "SDL_events.h" -#include "SDL_string.h" #include "SDL_events_c.h" #include "SDL_timer_c.h" #ifndef DISABLE_JOYSTICK diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c index f15161a89..0b0850070 100644 --- a/src/events/SDL_keyboard.c +++ b/src/events/SDL_keyboard.c @@ -22,10 +22,8 @@ /* General keyboard handling code for SDL */ -#include "SDL_error.h" -#include "SDL_events.h" #include "SDL_timer.h" -#include "SDL_string.h" +#include "SDL_events.h" #include "SDL_events_c.h" #include "SDL_sysevents.h" diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c index 636baf9fb..562a41a2b 100644 --- a/src/events/SDL_mouse.c +++ b/src/events/SDL_mouse.c @@ -23,7 +23,6 @@ /* General mouse handling code for SDL */ #include "SDL_events.h" -#include "SDL_string.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" #include "SDL_sysvideo.h" diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index 65dc851c8..b98ffffce 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -24,7 +24,6 @@ data sources. It can easily be extended to files, memory, etc. */ -#include "SDL_error.h" #include "SDL_endian.h" #include "SDL_rwops.h" diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c index 0d590255e..6655a5a1d 100644 --- a/src/joystick/SDL_joystick.c +++ b/src/joystick/SDL_joystick.c @@ -22,9 +22,6 @@ /* This is the joystick API for Simple DirectMedia Layer */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_events.h" #ifndef DISABLE_EVENTS #include "SDL_events_c.h" diff --git a/src/joystick/amigaos/SDL_sysjoystick.c b/src/joystick/amigaos/SDL_sysjoystick.c index 650d71b9d..7e06480db 100644 --- a/src/joystick/amigaos/SDL_sysjoystick.c +++ b/src/joystick/amigaos/SDL_sysjoystick.c @@ -38,8 +38,6 @@ extern struct ExecBase *SysBase; extern struct GfxBase *GfxBase; -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/beos/SDL_bejoystick.cc b/src/joystick/beos/SDL_bejoystick.cc index d958e06d2..e0be88d8d 100644 --- a/src/joystick/beos/SDL_bejoystick.cc +++ b/src/joystick/beos/SDL_bejoystick.cc @@ -27,9 +27,6 @@ extern "C" { -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 92dcc35fd..8681611bd 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -56,9 +56,6 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c index 0aa470155..0673121ba 100644 --- a/src/joystick/darwin/SDL_sysjoystick.c +++ b/src/joystick/darwin/SDL_sysjoystick.c @@ -41,7 +41,6 @@ #include #include /* for NewPtrClear, DisposePtr */ -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/dc/SDL_sysjoystick.c b/src/joystick/dc/SDL_sysjoystick.c index 001da769c..0e9511da2 100644 --- a/src/joystick/dc/SDL_sysjoystick.c +++ b/src/joystick/dc/SDL_sysjoystick.c @@ -22,9 +22,6 @@ /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c index ef7dc5fdb..5a7003d82 100644 --- a/src/joystick/dummy/SDL_sysjoystick.c +++ b/src/joystick/dummy/SDL_sysjoystick.c @@ -22,9 +22,6 @@ /* This is the system specific header for the SDL joystick API */ -#include /* For the definition of NULL */ - -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 770c57e75..ed1456e01 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -35,9 +35,6 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/macos/SDL_sysjoystick.c b/src/joystick/macos/SDL_sysjoystick.c index 0e40e85fe..8cef2f3a2 100644 --- a/src/joystick/macos/SDL_sysjoystick.c +++ b/src/joystick/macos/SDL_sysjoystick.c @@ -26,11 +26,8 @@ The code that follows is meant for SDL. Use at your own risk. */ -#include - #include -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c index 14c7066f3..33270a918 100644 --- a/src/joystick/mint/SDL_sysjoystick.c +++ b/src/joystick/mint/SDL_sysjoystick.c @@ -29,11 +29,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_types.h" -#include "SDL_error.h" -#include "SDL_joystick.h" #include "SDL_events.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/os2/SDL_sysjoystick.c b/src/joystick/os2/SDL_sysjoystick.c index 57da3b29f..d0ccec759 100644 --- a/src/joystick/os2/SDL_sysjoystick.c +++ b/src/joystick/os2/SDL_sysjoystick.c @@ -30,9 +30,6 @@ #include #include "joyos2.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/riscos/SDL_sysjoystick.c b/src/joystick/riscos/SDL_sysjoystick.c index 76dea923c..51ad7217b 100644 --- a/src/joystick/riscos/SDL_sysjoystick.c +++ b/src/joystick/riscos/SDL_sysjoystick.c @@ -29,9 +29,6 @@ /* This is the system specific header for the SDL joystick API */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/win32/SDL_mmjoystick.c index 532b571c0..3d180f750 100644 --- a/src/joystick/win32/SDL_mmjoystick.c +++ b/src/joystick/win32/SDL_mmjoystick.c @@ -22,18 +22,15 @@ /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" +#include "SDL_windows.h" +#include +#include + #include "SDL_events.h" #include "SDL_joystick.h" #include "SDL_sysjoystick.h" #include "SDL_joystick_c.h" -#include "SDL_windows.h" -#include -#include - #define MAX_JOYSTICKS 16 #define MAX_AXES 6 /* each joystick can have up to 6 axes */ #define MAX_BUTTONS 32 /* and 32 buttons */ diff --git a/src/loadso/beos/SDL_loadso.c b/src/loadso/beos/SDL_loadso.c index 0bd8fb7bc..42b679e74 100644 --- a/src/loadso/beos/SDL_loadso.c +++ b/src/loadso/beos/SDL_loadso.c @@ -34,8 +34,6 @@ #include #include -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/dlopen/SDL_loadso.c b/src/loadso/dlopen/SDL_loadso.c index 6db8d11d2..d02d20299 100644 --- a/src/loadso/dlopen/SDL_loadso.c +++ b/src/loadso/dlopen/SDL_loadso.c @@ -34,8 +34,6 @@ #include #include -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/dummy/SDL_loadso.c b/src/loadso/dummy/SDL_loadso.c index c46fa892a..58df827c5 100644 --- a/src/loadso/dummy/SDL_loadso.c +++ b/src/loadso/dummy/SDL_loadso.c @@ -27,8 +27,6 @@ #error Do not compile directly...compile src/SDL_loadso.c instead! #endif -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/macos/SDL_loadso.c b/src/loadso/macos/SDL_loadso.c index 26de2dd43..61fb044a7 100644 --- a/src/loadso/macos/SDL_loadso.c +++ b/src/loadso/macos/SDL_loadso.c @@ -38,8 +38,6 @@ #include #include -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/macosx/SDL_loadso.c b/src/loadso/macosx/SDL_loadso.c index 2d1fac22a..f7b59c5b5 100644 --- a/src/loadso/macosx/SDL_loadso.c +++ b/src/loadso/macosx/SDL_loadso.c @@ -70,8 +70,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" /* Just playing to see if it would compile with the freebsd headers, it does, * but because of the different values for RTLD_LOCAL etc, it would break binary @@ -1382,8 +1381,6 @@ static dlfunc_t SDL_OSX_dlfunc(void * dl_restrict handle, const char * dl_restri #error Do not use USE_DLOPEN on Mac OS X. #endif -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/mint/SDL_loadso.c b/src/loadso/mint/SDL_loadso.c index 32e11a909..82c46b863 100644 --- a/src/loadso/mint/SDL_loadso.c +++ b/src/loadso/mint/SDL_loadso.c @@ -36,8 +36,6 @@ #include #include -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/os2/SDL_loadso.c b/src/loadso/os2/SDL_loadso.c index 37a086212..e3c04b42c 100644 --- a/src/loadso/os2/SDL_loadso.c +++ b/src/loadso/os2/SDL_loadso.c @@ -36,8 +36,6 @@ #define INCL_DOSMODULEMGR #include -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/loadso/windows/SDL_loadso.c b/src/loadso/windows/SDL_loadso.c index 2b6152264..87ad6a9db 100644 --- a/src/loadso/windows/SDL_loadso.c +++ b/src/loadso/windows/SDL_loadso.c @@ -33,8 +33,6 @@ #include "SDL_windows.h" -#include "SDL_types.h" -#include "SDL_error.h" #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) diff --git a/src/main/beos/exports/Makefile b/src/main/beos/exports/Makefile index 735747828..9c0a13cad 100644 --- a/src/main/beos/exports/Makefile +++ b/src/main/beos/exports/Makefile @@ -4,14 +4,12 @@ HEADERS = \ ../../../../include/SDL.h \ ../../../../include/SDL_active.h \ ../../../../include/SDL_audio.h \ - ../../../../include/SDL_byteorder.h \ ../../../../include/SDL_cdrom.h \ ../../../../include/SDL_copying.h \ ../../../../include/SDL_cpuinfo.h \ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ - ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ @@ -23,7 +21,6 @@ HEADERS = \ ../../../../include/SDL_syswm.h \ ../../../../include/SDL_thread.h \ ../../../../include/SDL_timer.h \ - ../../../../include/SDL_types.h \ ../../../../include/SDL_version.h \ ../../../../include/SDL_video.h diff --git a/src/main/macos/exports/Makefile b/src/main/macos/exports/Makefile index 3df3ed1b6..0fd79fddf 100644 --- a/src/main/macos/exports/Makefile +++ b/src/main/macos/exports/Makefile @@ -4,14 +4,12 @@ HEADERS = \ ../../../../include/SDL.h \ ../../../../include/SDL_active.h \ ../../../../include/SDL_audio.h \ - ../../../../include/SDL_byteorder.h \ ../../../../include/SDL_cdrom.h \ ../../../../include/SDL_copying.h \ ../../../../include/SDL_cpuinfo.h \ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ - ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ @@ -23,7 +21,6 @@ HEADERS = \ ../../../../include/SDL_syswm.h \ ../../../../include/SDL_thread.h \ ../../../../include/SDL_timer.h \ - ../../../../include/SDL_types.h \ ../../../../include/SDL_version.h \ ../../../../include/SDL_video.h diff --git a/src/main/macosx/exports/Makefile b/src/main/macosx/exports/Makefile index 3df3ed1b6..0fd79fddf 100644 --- a/src/main/macosx/exports/Makefile +++ b/src/main/macosx/exports/Makefile @@ -4,14 +4,12 @@ HEADERS = \ ../../../../include/SDL.h \ ../../../../include/SDL_active.h \ ../../../../include/SDL_audio.h \ - ../../../../include/SDL_byteorder.h \ ../../../../include/SDL_cdrom.h \ ../../../../include/SDL_copying.h \ ../../../../include/SDL_cpuinfo.h \ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ - ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ @@ -23,7 +21,6 @@ HEADERS = \ ../../../../include/SDL_syswm.h \ ../../../../include/SDL_thread.h \ ../../../../include/SDL_timer.h \ - ../../../../include/SDL_types.h \ ../../../../include/SDL_version.h \ ../../../../include/SDL_video.h diff --git a/src/main/win32/SDL_win32_main.c b/src/main/win32/SDL_win32_main.c index 1561605b8..4830e0104 100644 --- a/src/main/win32/SDL_win32_main.c +++ b/src/main/win32/SDL_win32_main.c @@ -9,9 +9,6 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" - #ifdef _WIN32_WCE # define DIR_SEPERATOR TEXT("\\") # undef _getcwd diff --git a/src/main/win32/exports/Makefile b/src/main/win32/exports/Makefile index 8bc67f397..69699d363 100644 --- a/src/main/win32/exports/Makefile +++ b/src/main/win32/exports/Makefile @@ -4,14 +4,12 @@ HEADERS = \ ../../../../include/SDL.h \ ../../../../include/SDL_active.h \ ../../../../include/SDL_audio.h \ - ../../../../include/SDL_byteorder.h \ ../../../../include/SDL_cdrom.h \ ../../../../include/SDL_copying.h \ ../../../../include/SDL_cpuinfo.h \ ../../../../include/SDL_endian.h \ ../../../../include/SDL_error.h \ ../../../../include/SDL_events.h \ - ../../../../include/SDL_getenv.h \ ../../../../include/SDL_joystick.h \ ../../../../include/SDL_keyboard.h \ ../../../../include/SDL_keysym.h \ @@ -23,7 +21,6 @@ HEADERS = \ ../../../../include/SDL_syswm.h \ ../../../../include/SDL_thread.h \ ../../../../include/SDL_timer.h \ - ../../../../include/SDL_types.h \ ../../../../include/SDL_version.h \ ../../../../include/SDL_video.h diff --git a/src/stdlib/SDL_getenv.c b/src/stdlib/SDL_getenv.c index efc86c1e5..4ac0aa869 100644 --- a/src/stdlib/SDL_getenv.c +++ b/src/stdlib/SDL_getenv.c @@ -27,7 +27,6 @@ #if defined(WIN32) && !defined(_WIN32_WCE) #include "SDL_windows.h" -#include "SDL_string.h" /* Note this isn't thread-safe! */ diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c index 7a27c0988..4c82583ca 100644 --- a/src/stdlib/SDL_string.c +++ b/src/stdlib/SDL_string.c @@ -353,7 +353,7 @@ char *SDL_strupr(char *string) { char *bufp = string; while ( *bufp ) { - *bufp = toupper(*bufp); + *bufp = SDL_toupper(*bufp); ++bufp; } return string; @@ -365,7 +365,7 @@ char *SDL_strlwr(char *string) { char *bufp = string; while ( *bufp ) { - *bufp = tolower(*bufp); + *bufp = SDL_tolower(*bufp); ++bufp; } return string; @@ -609,8 +609,8 @@ int SDL_strcasecmp(const char *str1, const char *str2) char a = 0; char b = 0; while (*str1 && *str2) { - a = tolower(*str1); - b = tolower(*str2); + a = SDL_tolower(*str1); + b = SDL_tolower(*str2); if ( a != b ) break; ++str1; @@ -713,7 +713,7 @@ int SDL_sscanf(const char *text, const char *fmt, ...) ++index; } if ( text[index] == '0' ) { - if ( tolower(text[index+1]) == 'x' ) { + if ( SDL_tolower(text[index+1]) == 'x' ) { radix = 16; } else { radix = 8; diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c index b763466f0..b4c8ae96c 100644 --- a/src/thread/SDL_thread.c +++ b/src/thread/SDL_thread.c @@ -22,9 +22,6 @@ /* System independent thread management routines for SDL */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_thread.h" #include "SDL_thread_c.h" diff --git a/src/thread/amigaos/SDL_syssem.c b/src/thread/amigaos/SDL_syssem.c index 43d9b071c..1222b687d 100644 --- a/src/thread/amigaos/SDL_syssem.c +++ b/src/thread/amigaos/SDL_syssem.c @@ -22,7 +22,6 @@ /* An implementation of semaphores using mutexes and condition variables */ -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/amigaos/SDL_systhread.c b/src/thread/amigaos/SDL_systhread.c index 722588f7a..6fabd2fff 100644 --- a/src/thread/amigaos/SDL_systhread.c +++ b/src/thread/amigaos/SDL_systhread.c @@ -22,7 +22,6 @@ /* BeOS thread management routines for SDL */ -#include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_thread.h" #include "SDL_thread_c.h" diff --git a/src/thread/amigaos/SDL_thread.c b/src/thread/amigaos/SDL_thread.c index 2f7332f3b..e73f7c73f 100644 --- a/src/thread/amigaos/SDL_thread.c +++ b/src/thread/amigaos/SDL_thread.c @@ -22,9 +22,6 @@ /* System independent thread management routines for SDL */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_thread.h" #include "SDL_thread_c.h" diff --git a/src/thread/beos/SDL_syssem.c b/src/thread/beos/SDL_syssem.c index ca159056b..fff54da7b 100644 --- a/src/thread/beos/SDL_syssem.c +++ b/src/thread/beos/SDL_syssem.c @@ -24,7 +24,6 @@ #include -#include "SDL_error.h" #include "SDL_thread.h" diff --git a/src/thread/beos/SDL_systhread.c b/src/thread/beos/SDL_systhread.c index b6d412755..5ba04da89 100644 --- a/src/thread/beos/SDL_systhread.c +++ b/src/thread/beos/SDL_systhread.c @@ -26,7 +26,6 @@ #include #include -#include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_thread.h" #include "SDL_thread_c.h" diff --git a/src/thread/bsdi/SDL_syssem.c b/src/thread/bsdi/SDL_syssem.c index 8b663cdd5..57b7bc07f 100644 --- a/src/thread/bsdi/SDL_syssem.c +++ b/src/thread/bsdi/SDL_syssem.c @@ -20,8 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_timer.h" diff --git a/src/thread/dc/SDL_syscond.c b/src/thread/dc/SDL_syscond.c index 062d7e3dd..73e17bc94 100644 --- a/src/thread/dc/SDL_syscond.c +++ b/src/thread/dc/SDL_syscond.c @@ -26,8 +26,6 @@ implementation, written by Christopher Tate and Owen Smith. Thanks! */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" struct SDL_cond diff --git a/src/thread/dc/SDL_sysmutex.c b/src/thread/dc/SDL_sysmutex.c index 165b63fd3..2160107d9 100644 --- a/src/thread/dc/SDL_sysmutex.c +++ b/src/thread/dc/SDL_sysmutex.c @@ -22,8 +22,6 @@ /* An implementation of mutexes using semaphores */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/dc/SDL_syssem.c b/src/thread/dc/SDL_syssem.c index a56efbc7b..8f9368cfa 100644 --- a/src/thread/dc/SDL_syssem.c +++ b/src/thread/dc/SDL_syssem.c @@ -22,7 +22,6 @@ /* An implementation of semaphores using mutexes and condition variables */ -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/dc/SDL_systhread.c b/src/thread/dc/SDL_systhread.c index 06f83554a..05b9fb4a8 100644 --- a/src/thread/dc/SDL_systhread.c +++ b/src/thread/dc/SDL_systhread.c @@ -22,7 +22,6 @@ /* Thread management routines for SDL */ -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/generic/SDL_syscond.c b/src/thread/generic/SDL_syscond.c index 062d7e3dd..73e17bc94 100644 --- a/src/thread/generic/SDL_syscond.c +++ b/src/thread/generic/SDL_syscond.c @@ -26,8 +26,6 @@ implementation, written by Christopher Tate and Owen Smith. Thanks! */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" struct SDL_cond diff --git a/src/thread/generic/SDL_sysmutex.c b/src/thread/generic/SDL_sysmutex.c index 8d1ee1ba7..4b1733094 100644 --- a/src/thread/generic/SDL_sysmutex.c +++ b/src/thread/generic/SDL_sysmutex.c @@ -22,8 +22,6 @@ /* An implementation of mutexes using semaphores */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/generic/SDL_syssem.c b/src/thread/generic/SDL_syssem.c index f6a8bb575..1aea8d68b 100644 --- a/src/thread/generic/SDL_syssem.c +++ b/src/thread/generic/SDL_syssem.c @@ -22,8 +22,6 @@ /* An implementation of semaphores using mutexes and condition variables */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/generic/SDL_systhread.c b/src/thread/generic/SDL_systhread.c index 3d0c52db8..89b4f9b25 100644 --- a/src/thread/generic/SDL_systhread.c +++ b/src/thread/generic/SDL_systhread.c @@ -22,7 +22,6 @@ /* Thread management routines for SDL */ -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/irix/SDL_systhread.c b/src/thread/irix/SDL_systhread.c index 5f450e9cf..4433f406d 100644 --- a/src/thread/irix/SDL_systhread.c +++ b/src/thread/irix/SDL_systhread.c @@ -28,7 +28,6 @@ #include #include -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/linux/SDL_syscond.c b/src/thread/linux/SDL_syscond.c index 5417d1d80..8c82a33b9 100644 --- a/src/thread/linux/SDL_syscond.c +++ b/src/thread/linux/SDL_syscond.c @@ -42,8 +42,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_sysmutex_c.h" diff --git a/src/thread/linux/SDL_sysmutex.c b/src/thread/linux/SDL_sysmutex.c index fe9aba507..2fcae6d7e 100644 --- a/src/thread/linux/SDL_sysmutex.c +++ b/src/thread/linux/SDL_sysmutex.c @@ -39,8 +39,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" diff --git a/src/thread/linux/SDL_syssem.c b/src/thread/linux/SDL_syssem.c index 86c583ba8..881f4f46d 100644 --- a/src/thread/linux/SDL_syssem.c +++ b/src/thread/linux/SDL_syssem.c @@ -20,8 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_timer.h" diff --git a/src/thread/linux/SDL_systhread.c b/src/thread/linux/SDL_systhread.c index 7dc354e66..5c541758d 100644 --- a/src/thread/linux/SDL_systhread.c +++ b/src/thread/linux/SDL_systhread.c @@ -22,8 +22,6 @@ /* Linux thread management routines for SDL */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/os2/SDL_syscond.c b/src/thread/os2/SDL_syscond.c index da833d5eb..bbb0af38f 100644 --- a/src/thread/os2/SDL_syscond.c +++ b/src/thread/os2/SDL_syscond.c @@ -26,8 +26,6 @@ implementation, written by Christopher Tate and Owen Smith. Thanks! */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" struct SDL_cond diff --git a/src/thread/os2/SDL_sysmutex.c b/src/thread/os2/SDL_sysmutex.c index 2c9003b4e..ad3907531 100644 --- a/src/thread/os2/SDL_sysmutex.c +++ b/src/thread/os2/SDL_sysmutex.c @@ -26,8 +26,6 @@ #define INCL_DOSSEMAPHORES #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_mutex.h" diff --git a/src/thread/os2/SDL_syssem.c b/src/thread/os2/SDL_syssem.c index 565c966f1..2cb38fefc 100644 --- a/src/thread/os2/SDL_syssem.c +++ b/src/thread/os2/SDL_syssem.c @@ -27,8 +27,6 @@ #define INCL_DOSSEMAPHORES #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_timer.h" diff --git a/src/thread/os2/SDL_systhread.c b/src/thread/os2/SDL_systhread.c index 78a3925f8..d1120f3d6 100644 --- a/src/thread/os2/SDL_systhread.c +++ b/src/thread/os2/SDL_systhread.c @@ -27,8 +27,6 @@ #define INCL_DOSPROCESS #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/pth/SDL_syscond.c b/src/thread/pth/SDL_syscond.c index f0480b710..c003202e1 100644 --- a/src/thread/pth/SDL_syscond.c +++ b/src/thread/pth/SDL_syscond.c @@ -6,8 +6,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_syscond_c.h" #include "SDL_sysmutex_c.h" diff --git a/src/thread/pth/SDL_sysmutex.c b/src/thread/pth/SDL_sysmutex.c index a3ab3ea38..dacc24ecb 100644 --- a/src/thread/pth/SDL_sysmutex.c +++ b/src/thread/pth/SDL_sysmutex.c @@ -6,8 +6,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_sysmutex_c.h" diff --git a/src/thread/pth/SDL_systhread.c b/src/thread/pth/SDL_systhread.c index ab26e96c8..643e800c7 100644 --- a/src/thread/pth/SDL_systhread.c +++ b/src/thread/pth/SDL_systhread.c @@ -26,7 +26,6 @@ * Patrice Mandin */ -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/riscos/SDL_syscond.c b/src/thread/riscos/SDL_syscond.c index 462f3536a..9e5aa3a46 100644 --- a/src/thread/riscos/SDL_syscond.c +++ b/src/thread/riscos/SDL_syscond.c @@ -29,8 +29,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_sysmutex_c.h" diff --git a/src/thread/riscos/SDL_sysmutex.c b/src/thread/riscos/SDL_sysmutex.c index c5e023ece..6ab508446 100644 --- a/src/thread/riscos/SDL_sysmutex.c +++ b/src/thread/riscos/SDL_sysmutex.c @@ -28,8 +28,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" struct SDL_mutex { diff --git a/src/thread/riscos/SDL_syssem.c b/src/thread/riscos/SDL_syssem.c index d7a5dad6f..54e283850 100644 --- a/src/thread/riscos/SDL_syssem.c +++ b/src/thread/riscos/SDL_syssem.c @@ -23,8 +23,6 @@ /* RISC OS semiphores based on linux code */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_systhread_c.h" diff --git a/src/thread/riscos/SDL_systhread.c b/src/thread/riscos/SDL_systhread.c index 77ab64be0..7f0a0649a 100644 --- a/src/thread/riscos/SDL_systhread.c +++ b/src/thread/riscos/SDL_systhread.c @@ -22,7 +22,6 @@ /* RISC OS version based on pthreads linux source */ -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/thread/win32/SDL_sysmutex.c b/src/thread/win32/SDL_sysmutex.c index b7bf77513..4f78d2f51 100644 --- a/src/thread/win32/SDL_sysmutex.c +++ b/src/thread/win32/SDL_sysmutex.c @@ -24,8 +24,6 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_mutex.h" diff --git a/src/thread/win32/SDL_syssem.c b/src/thread/win32/SDL_syssem.c index ef3e4aaac..6f1c4caa5 100644 --- a/src/thread/win32/SDL_syssem.c +++ b/src/thread/win32/SDL_syssem.c @@ -24,8 +24,6 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #if defined(_WIN32_WCE) && (_WIN32_WCE < 300) #include "win_ce_semaphore.h" diff --git a/src/thread/win32/SDL_systhread.c b/src/thread/win32/SDL_systhread.c index 74239a7d3..0b90b4189 100644 --- a/src/thread/win32/SDL_systhread.c +++ b/src/thread/win32/SDL_systhread.c @@ -24,8 +24,6 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_thread.h" #include "SDL_systhread.h" diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c index 3e876882c..a90c8e458 100644 --- a/src/timer/SDL_timer.c +++ b/src/timer/SDL_timer.c @@ -20,8 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_timer_c.h" #include "SDL_mutex.h" diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c index 5fad1a379..c1190437b 100644 --- a/src/timer/amigaos/SDL_systimer.c +++ b/src/timer/amigaos/SDL_systimer.c @@ -48,7 +48,6 @@ extern struct DosLibrary *DOSBase; extern struct ExecBase *SysBase; static struct GfxBase *GfxBase; -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_timer_c.h" diff --git a/src/timer/beos/SDL_systimer.c b/src/timer/beos/SDL_systimer.c index 12dbfc8d8..17f5f7414 100644 --- a/src/timer/beos/SDL_systimer.c +++ b/src/timer/beos/SDL_systimer.c @@ -24,7 +24,6 @@ #include "SDL_thread.h" #include "SDL_timer.h" -#include "SDL_error.h" #include "SDL_timer_c.h" static bigtime_t start; diff --git a/src/timer/dc/SDL_systimer.c b/src/timer/dc/SDL_systimer.c index 73750f283..13bef07c1 100644 --- a/src/timer/dc/SDL_systimer.c +++ b/src/timer/dc/SDL_systimer.c @@ -24,7 +24,6 @@ #include "SDL_thread.h" #include "SDL_timer.h" -#include "SDL_error.h" #include "SDL_timer_c.h" static unsigned start; diff --git a/src/timer/linux/SDL_systimer.c b/src/timer/linux/SDL_systimer.c index 8e0e258bc..f41e76ed2 100644 --- a/src/timer/linux/SDL_systimer.c +++ b/src/timer/linux/SDL_systimer.c @@ -45,7 +45,6 @@ /*#define USE_CLOCK_GETTIME*/ #endif -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_timer_c.h" diff --git a/src/timer/mint/SDL_systimer.c b/src/timer/mint/SDL_systimer.c index a8aa4f6e7..4f058c357 100644 --- a/src/timer/mint/SDL_systimer.c +++ b/src/timer/mint/SDL_systimer.c @@ -39,7 +39,6 @@ #include #include -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_timer_c.h" #include "SDL_thread.h" diff --git a/src/timer/os2/SDL_systimer.c b/src/timer/os2/SDL_systimer.c index 33c8eaf79..25c2978c9 100644 --- a/src/timer/os2/SDL_systimer.c +++ b/src/timer/os2/SDL_systimer.c @@ -32,7 +32,6 @@ #include "SDL_thread.h" #include "SDL_timer.h" #include "SDL_timer_c.h" -#include "SDL_error.h" #define TIME_WRAP_VALUE (~(DWORD)0) diff --git a/src/timer/riscos/SDL_systimer.c b/src/timer/riscos/SDL_systimer.c index f5c097d74..15dfc1598 100644 --- a/src/timer/riscos/SDL_systimer.c +++ b/src/timer/riscos/SDL_systimer.c @@ -27,7 +27,6 @@ #include #include -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_timer_c.h" diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/win32/SDL_systimer.c index 690216299..194632727 100644 --- a/src/timer/win32/SDL_systimer.c +++ b/src/timer/win32/SDL_systimer.c @@ -25,7 +25,6 @@ #include "SDL_timer.h" #include "SDL_timer_c.h" -#include "SDL_error.h" #ifdef _WIN32_WCE #error This is WinCE. Please use src/timer/wince/SDL_systimer.c instead. diff --git a/src/timer/wince/SDL_systimer.c b/src/timer/wince/SDL_systimer.c index e54f7889a..a28f59570 100644 --- a/src/timer/wince/SDL_systimer.c +++ b/src/timer/wince/SDL_systimer.c @@ -25,7 +25,6 @@ #include "SDL_timer.h" #include "SDL_timer_c.h" -#include "SDL_error.h" static Uint64 start_date; static Uint64 start_ticks; diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c index 896208d42..7f181bbdb 100644 --- a/src/video/SDL_RLEaccel.c +++ b/src/video/SDL_RLEaccel.c @@ -85,11 +85,7 @@ * beginning of an opaque line. */ -#include "SDL_types.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_sysvideo.h" #include "SDL_blit.h" #include "SDL_RLEaccel_c.h" diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c index 3825ca4d0..093d8dbb7 100644 --- a/src/video/SDL_blit.c +++ b/src/video/SDL_blit.c @@ -20,9 +20,7 @@ slouken@libsdl.org */ -#include "SDL_error.h" #include "SDL_video.h" -#include "SDL_string.h" #include "SDL_sysvideo.h" #include "SDL_blit.h" #include "SDL_RLEaccel_c.h" diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c index fd2a0cdf2..2a7c01233 100644 --- a/src/video/SDL_blit_0.c +++ b/src/video/SDL_blit_0.c @@ -20,9 +20,7 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" -#include "SDL_string.h" #include "SDL_blit.h" /* Functions to blit from bitmaps to other surfaces */ diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c index 7eab19f60..0e737c074 100644 --- a/src/video/SDL_blit_1.c +++ b/src/video/SDL_blit_1.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" #include "SDL_sysvideo.h" diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index e99e02722..b7da68fb7 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index 43a1add9e..c114c6de6 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -20,12 +20,10 @@ slouken@libsdl.org */ -#include "SDL_types.h" -#include "SDL_string.h" #include "SDL_video.h" -#include "SDL_blit.h" -#include "SDL_byteorder.h" +#include "SDL_endian.h" #include "SDL_cpuinfo.h" +#include "SDL_blit.h" /* Functions to blit from N-bit surfaces to other surfaces */ diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c index 89abb3111..aa606bfba 100644 --- a/src/video/SDL_bmp.c +++ b/src/video/SDL_bmp.c @@ -34,10 +34,8 @@ This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp. */ -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_endian.h" -#include "SDL_string.h" /* Compression encodings for BMP files */ #ifndef BI_RGB diff --git a/src/video/SDL_cursor.c b/src/video/SDL_cursor.c index 0f9f3f339..14bdc9a2a 100644 --- a/src/video/SDL_cursor.c +++ b/src/video/SDL_cursor.c @@ -22,10 +22,7 @@ /* General cursor handling code for SDL */ -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_mutex.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_blit.h" diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c index 5ac70d66d..710c5aea2 100644 --- a/src/video/SDL_gamma.c +++ b/src/video/SDL_gamma.c @@ -36,9 +36,6 @@ #define log(x) __ieee754_log(x) #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_sysvideo.h" diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c index 4ebae04fe..0faf46c17 100644 --- a/src/video/SDL_pixels.c +++ b/src/video/SDL_pixels.c @@ -22,9 +22,6 @@ /* General (mostly internal) pixel/color manipulation routines for SDL */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_endian.h" #include "SDL_video.h" #include "SDL_sysvideo.h" diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c index 3cf596647..7499c8582 100644 --- a/src/video/SDL_stretch.c +++ b/src/video/SDL_stretch.c @@ -26,7 +26,6 @@ April 27, 2000 - Sam Lantinga */ -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_blit.h" diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c index e5e5d30e6..278532722 100644 --- a/src/video/SDL_surface.c +++ b/src/video/SDL_surface.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_sysvideo.h" #include "SDL_cursor_c.h" diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index bdf3e7fc9..87ced5f27 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -23,12 +23,6 @@ /* The high-level video driver subsystem */ #include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_events.h" -#include "SDL_mutex.h" #include "SDL_sysvideo.h" #include "SDL_sysevents.h" #include "SDL_blit.h" diff --git a/src/video/SDL_yuv.c b/src/video/SDL_yuv.c index 39582d3a1..5937cedd0 100644 --- a/src/video/SDL_yuv.c +++ b/src/video/SDL_yuv.c @@ -22,10 +22,7 @@ /* This is the implementation of the YUV video surface support */ -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_sysvideo.h" #include "SDL_yuvfuncs.h" #include "SDL_yuv_sw_c.h" diff --git a/src/video/SDL_yuv_mmx.c b/src/video/SDL_yuv_mmx.c index 1e7220a85..68020962b 100644 --- a/src/video/SDL_yuv_mmx.c +++ b/src/video/SDL_yuv_mmx.c @@ -20,11 +20,10 @@ slouken@libsdl.org */ +#include "SDL_stdinc.h" #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) -#include "SDL_types.h" - #define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used)) static unsigned int ASM_ARRAY(MMX_0080w) = {0x00800080, 0x00800080}; diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c index 79c95e13d..03d0e6d51 100644 --- a/src/video/SDL_yuv_sw.c +++ b/src/video/SDL_yuv_sw.c @@ -82,9 +82,6 @@ * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_cpuinfo.h" #include "SDL_stretch_c.h" diff --git a/src/video/aalib/SDL_aamouse.c b/src/video/aalib/SDL_aamouse.c index 769c73707..3caffc35f 100644 --- a/src/video/aalib/SDL_aamouse.c +++ b/src/video/aalib/SDL_aamouse.c @@ -22,7 +22,6 @@ #include -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" diff --git a/src/video/aalib/SDL_aavideo.c b/src/video/aalib/SDL_aavideo.c index b5f406ce3..cd315e898 100644 --- a/src/video/aalib/SDL_aavideo.c +++ b/src/video/aalib/SDL_aavideo.c @@ -27,10 +27,6 @@ #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/ataricommon/SDL_ataric2p_s.h b/src/video/ataricommon/SDL_ataric2p_s.h index c7a059463..85da9517a 100644 --- a/src/video/ataricommon/SDL_ataric2p_s.h +++ b/src/video/ataricommon/SDL_ataric2p_s.h @@ -23,7 +23,7 @@ #ifndef _ATARI_C2P_h #define _ATARI_C2P_h -#include "SDL_types.h" +#include "SDL_stdinc.h" /*--- Functions pointers ---*/ diff --git a/src/video/ataricommon/SDL_atarievents.c b/src/video/ataricommon/SDL_atarievents.c index 137959cc2..721ad6e44 100644 --- a/src/video/ataricommon/SDL_atarievents.c +++ b/src/video/ataricommon/SDL_atarievents.c @@ -30,9 +30,6 @@ #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/ataricommon/SDL_atarigl.c b/src/video/ataricommon/SDL_atarigl.c index cf1ffcd95..368e41dba 100644 --- a/src/video/ataricommon/SDL_atarigl.c +++ b/src/video/ataricommon/SDL_atarigl.c @@ -30,11 +30,8 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_video.h" -#include "SDL_error.h" #include "SDL_endian.h" +#include "SDL_video.h" #include "SDL_atarigl_c.h" #ifdef ENABLE_OSMESA_SHARED #include "SDL_loadso.h" diff --git a/src/video/ataricommon/SDL_atarimxalloc.c b/src/video/ataricommon/SDL_atarimxalloc.c index eac30de43..e83e71949 100644 --- a/src/video/ataricommon/SDL_atarimxalloc.c +++ b/src/video/ataricommon/SDL_atarimxalloc.c @@ -28,7 +28,7 @@ #include -#include "SDL_types.h" +#include "SDL_stdinc.h" /*--- Variables ---*/ diff --git a/src/video/ataricommon/SDL_biosevents.c b/src/video/ataricommon/SDL_biosevents.c index 613280b77..63653c277 100644 --- a/src/video/ataricommon/SDL_biosevents.c +++ b/src/video/ataricommon/SDL_biosevents.c @@ -30,8 +30,6 @@ #include #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/ataricommon/SDL_gemdosevents.c b/src/video/ataricommon/SDL_gemdosevents.c index 5ac2f1eeb..066a6397c 100644 --- a/src/video/ataricommon/SDL_gemdosevents.c +++ b/src/video/ataricommon/SDL_gemdosevents.c @@ -30,8 +30,6 @@ #include #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/ataricommon/SDL_ikbdevents.c b/src/video/ataricommon/SDL_ikbdevents.c index d95847cd4..8387773e0 100644 --- a/src/video/ataricommon/SDL_ikbdevents.c +++ b/src/video/ataricommon/SDL_ikbdevents.c @@ -29,8 +29,6 @@ /* Mint includes */ #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/ataricommon/SDL_ikbdinterrupt_s.h b/src/video/ataricommon/SDL_ikbdinterrupt_s.h index 32b7523b2..c3b8d8263 100644 --- a/src/video/ataricommon/SDL_ikbdinterrupt_s.h +++ b/src/video/ataricommon/SDL_ikbdinterrupt_s.h @@ -31,7 +31,7 @@ #include -#include "SDL_types.h" +#include "SDL_stdinc.h" /* Const */ diff --git a/src/video/ataricommon/SDL_xbiosinterrupt_s.h b/src/video/ataricommon/SDL_xbiosinterrupt_s.h index 5125bac06..204c2363e 100644 --- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h +++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h @@ -31,7 +31,7 @@ #include -#include "SDL_types.h" +#include "SDL_stdinc.h" /* Variables */ diff --git a/src/video/bwindow/SDL_sysmouse.cc b/src/video/bwindow/SDL_sysmouse.cc index 053fdfe31..aa8821e1f 100644 --- a/src/video/bwindow/SDL_sysmouse.cc +++ b/src/video/bwindow/SDL_sysmouse.cc @@ -23,9 +23,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_BWin.h" extern "C" { diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc index 29ebe32f7..34504b6a8 100644 --- a/src/video/bwindow/SDL_sysvideo.cc +++ b/src/video/bwindow/SDL_sysvideo.cc @@ -24,9 +24,6 @@ #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_BeApp.h" #include "SDL_BWin.h" #include "SDL_timer.h" diff --git a/src/video/bwindow/SDL_sysyuv.cc b/src/video/bwindow/SDL_sysyuv.cc index fd90ff73c..0fd580d29 100644 --- a/src/video/bwindow/SDL_sysyuv.cc +++ b/src/video/bwindow/SDL_sysyuv.cc @@ -22,8 +22,6 @@ /* This is the BeOS version of SDL YUV video overlays */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_sysyuv.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/cybergfx/SDL_amigamouse.c b/src/video/cybergfx/SDL_amigamouse.c index 548789d97..98cdd00ce 100644 --- a/src/video/cybergfx/SDL_amigamouse.c +++ b/src/video/cybergfx/SDL_amigamouse.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/cybergfx/SDL_cgxaccel.c b/src/video/cybergfx/SDL_cgxaccel.c index 15be8ce8a..b0a87aae9 100644 --- a/src/video/cybergfx/SDL_cgxaccel.c +++ b/src/video/cybergfx/SDL_cgxaccel.c @@ -20,11 +20,10 @@ slouken@libsdl.org */ -#include "SDL_error.h" #include "SDL_endian.h" +#include "SDL_video.h" #include "SDL_sysvideo.h" #include "SDL_blit.h" -#include "SDL_video.h" #include "SDL_cgxvideo.h" static int CGX_HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, diff --git a/src/video/cybergfx/SDL_cgxgl.c b/src/video/cybergfx/SDL_cgxgl.c index 851e97e2b..78d167e3b 100644 --- a/src/video/cybergfx/SDL_cgxgl.c +++ b/src/video/cybergfx/SDL_cgxgl.c @@ -22,7 +22,6 @@ /* StormMesa implementation of SDL OpenGL support */ -#include "SDL_error.h" #include "SDL_cgxgl_c.h" #include "SDL_cgxvideo.h" diff --git a/src/video/cybergfx/SDL_cgximage.c b/src/video/cybergfx/SDL_cgximage.c index 82a4ed3a5..158893185 100644 --- a/src/video/cybergfx/SDL_cgximage.c +++ b/src/video/cybergfx/SDL_cgximage.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_endian.h" #include "SDL_cgximage_c.h" diff --git a/src/video/cybergfx/SDL_cgxmodes.c b/src/video/cybergfx/SDL_cgxmodes.c index f7d6e4f67..54c2a6dc5 100644 --- a/src/video/cybergfx/SDL_cgxmodes.c +++ b/src/video/cybergfx/SDL_cgxmodes.c @@ -23,7 +23,6 @@ /* Utilities for getting and setting the X display mode */ #include "SDL_timer.h" -#include "SDL_error.h" #include "SDL_events.h" #include "SDL_events_c.h" #include "SDL_cgxvideo.h" diff --git a/src/video/cybergfx/SDL_cgxvideo.c b/src/video/cybergfx/SDL_cgxvideo.c index eedd9127d..268b037cb 100644 --- a/src/video/cybergfx/SDL_cgxvideo.c +++ b/src/video/cybergfx/SDL_cgxvideo.c @@ -25,13 +25,11 @@ * gabriele.greco@aruba.it */ -#include "SDL.h" -#include "SDL_error.h" +#include "SDL_endian.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_video.h" #include "SDL_mouse.h" -#include "SDL_endian.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" diff --git a/src/video/cybergfx/SDL_cgxvideo.h b/src/video/cybergfx/SDL_cgxvideo.h index de3be482b..d0d283176 100644 --- a/src/video/cybergfx/SDL_cgxvideo.h +++ b/src/video/cybergfx/SDL_cgxvideo.h @@ -43,8 +43,6 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" #include "mydebug.h" diff --git a/src/video/cybergfx/SDL_cgxwm.c b/src/video/cybergfx/SDL_cgxwm.c index ddac3df99..02e6d4195 100644 --- a/src/video/cybergfx/SDL_cgxwm.c +++ b/src/video/cybergfx/SDL_cgxwm.c @@ -21,7 +21,6 @@ */ #include "SDL_version.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_video.h" #include "SDL_syswm.h" diff --git a/src/video/cybergfx/SDL_cgxyuv.c b/src/video/cybergfx/SDL_cgxyuv.c index 73745a12e..5256e1b94 100644 --- a/src/video/cybergfx/SDL_cgxyuv.c +++ b/src/video/cybergfx/SDL_cgxyuv.c @@ -30,9 +30,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_x11yuv_c.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/dc/SDL_dcmouse.c b/src/video/dc/SDL_dcmouse.c index 44bf5cf60..4fcbaf174 100644 --- a/src/video/dc/SDL_dcmouse.c +++ b/src/video/dc/SDL_dcmouse.c @@ -22,7 +22,6 @@ #include -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" diff --git a/src/video/dc/SDL_dcvideo.c b/src/video/dc/SDL_dcvideo.c index d7f2ab8ee..4fc05ef49 100644 --- a/src/video/dc/SDL_dcvideo.c +++ b/src/video/dc/SDL_dcvideo.c @@ -20,10 +20,6 @@ slouken@libsdl.org */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/dga/SDL_dgamouse.c b/src/video/dga/SDL_dgamouse.c index 81ba5f799..477772be7 100644 --- a/src/video/dga/SDL_dgamouse.c +++ b/src/video/dga/SDL_dgamouse.c @@ -22,7 +22,6 @@ #include -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_dgavideo.h" diff --git a/src/video/dga/SDL_dgavideo.c b/src/video/dga/SDL_dgavideo.c index 1ac54f118..e83eb39f3 100644 --- a/src/video/dga/SDL_dgavideo.c +++ b/src/video/dga/SDL_dgavideo.c @@ -28,10 +28,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c index a7cd8d244..753df9096 100644 --- a/src/video/directfb/SDL_DirectFB_video.c +++ b/src/video/directfb/SDL_DirectFB_video.c @@ -34,10 +34,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/directfb/SDL_DirectFB_yuv.c b/src/video/directfb/SDL_DirectFB_yuv.c index 8f9b8ae24..896a9a174 100644 --- a/src/video/directfb/SDL_DirectFB_yuv.c +++ b/src/video/directfb/SDL_DirectFB_yuv.c @@ -22,8 +22,6 @@ /* This is the DirectFB implementation of YUV video overlays */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_DirectFB_yuv.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/dummy/SDL_nullmouse.c b/src/video/dummy/SDL_nullmouse.c index 0e3e2898c..993d4470a 100644 --- a/src/video/dummy/SDL_nullmouse.c +++ b/src/video/dummy/SDL_nullmouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c index b54395136..c69638e90 100644 --- a/src/video/dummy/SDL_nullvideo.c +++ b/src/video/dummy/SDL_nullvideo.c @@ -35,10 +35,6 @@ * SDL video driver. Renamed to "DUMMY" by Sam Lantinga. */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/epoc/SDL_epocvideo.cpp b/src/video/epoc/SDL_epocvideo.cpp index 643fcf278..4716a3e47 100644 --- a/src/video/epoc/SDL_epocvideo.cpp +++ b/src/video/epoc/SDL_epocvideo.cpp @@ -30,9 +30,6 @@ extern "C" { -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_video.h" #undef NULL diff --git a/src/video/fbcon/SDL_fb3dfx.c b/src/video/fbcon/SDL_fb3dfx.c index 77894c4f7..1a7ff920a 100644 --- a/src/video/fbcon/SDL_fb3dfx.c +++ b/src/video/fbcon/SDL_fb3dfx.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" #include "SDL_fb3dfx.h" diff --git a/src/video/fbcon/SDL_fbelo.c b/src/video/fbcon/SDL_fbelo.c index a7cdd1072..d9c1c4049 100644 --- a/src/video/fbcon/SDL_fbelo.c +++ b/src/video/fbcon/SDL_fbelo.c @@ -24,8 +24,7 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_fbvideo.h" #include "SDL_fbelo.h" diff --git a/src/video/fbcon/SDL_fbevents.c b/src/video/fbcon/SDL_fbevents.c index 64aed7cd6..8d696703a 100644 --- a/src/video/fbcon/SDL_fbevents.c +++ b/src/video/fbcon/SDL_fbevents.c @@ -39,9 +39,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_mutex.h" #include "SDL_sysevents.h" #include "SDL_sysvideo.h" diff --git a/src/video/fbcon/SDL_fbmatrox.c b/src/video/fbcon/SDL_fbmatrox.c index c0dab1165..eaccee0eb 100644 --- a/src/video/fbcon/SDL_fbmatrox.c +++ b/src/video/fbcon/SDL_fbmatrox.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" #include "SDL_fbmatrox.h" diff --git a/src/video/fbcon/SDL_fbmouse.c b/src/video/fbcon/SDL_fbmouse.c index c5569a37d..ad00cee07 100644 --- a/src/video/fbcon/SDL_fbmouse.c +++ b/src/video/fbcon/SDL_fbmouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_fbvideo.h" diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c index 373e13118..c94a9cd8c 100644 --- a/src/video/fbcon/SDL_fbriva.c +++ b/src/video/fbcon/SDL_fbriva.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" #include "SDL_fbriva.h" diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c index 0a7369548..1e24fd007 100644 --- a/src/video/fbcon/SDL_fbvideo.c +++ b/src/video/fbcon/SDL_fbvideo.c @@ -31,10 +31,6 @@ #include /* For definition of PAGE_SIZE */ #include /* For ioperm() */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/gapi/SDL_gapivideo.c b/src/video/gapi/SDL_gapivideo.c index a384d7b52..460e86938 100644 --- a/src/video/gapi/SDL_gapivideo.c +++ b/src/video/gapi/SDL_gapivideo.c @@ -32,9 +32,6 @@ Inspired by http://arisme.free.fr/ports/SDL.php // TODO: windib on SH3 PPC2000 landscape test // TODO: optimize 8bpp landscape mode -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c index 0936274bf..f6b9071e2 100644 --- a/src/video/gem/SDL_gemevents.c +++ b/src/video/gem/SDL_gemevents.c @@ -31,8 +31,6 @@ #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" #include "SDL_gemvideo.h" diff --git a/src/video/gem/SDL_gemmouse.c b/src/video/gem/SDL_gemmouse.c index 7546a9f2c..937e49937 100644 --- a/src/video/gem/SDL_gemmouse.c +++ b/src/video/gem/SDL_gemmouse.c @@ -28,8 +28,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/gem/SDL_gemvideo.c b/src/video/gem/SDL_gemvideo.c index 44229e762..3a6b8d33d 100644 --- a/src/video/gem/SDL_gemvideo.c +++ b/src/video/gem/SDL_gemvideo.c @@ -34,13 +34,9 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" +#include "SDL_endian.h" #include "SDL_video.h" #include "SDL_mouse.h" -#include "SDL_endian.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" diff --git a/src/video/ggi/SDL_ggimouse.c b/src/video/ggi/SDL_ggimouse.c index 62819b879..c1cbbae0c 100644 --- a/src/video/ggi/SDL_ggimouse.c +++ b/src/video/ggi/SDL_ggimouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_ggimouse_c.h" diff --git a/src/video/ggi/SDL_ggivideo.c b/src/video/ggi/SDL_ggivideo.c index 5362d21b4..51432de8e 100644 --- a/src/video/ggi/SDL_ggivideo.c +++ b/src/video/ggi/SDL_ggivideo.c @@ -30,10 +30,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/ipod/SDL_ipodvideo.c b/src/video/ipod/SDL_ipodvideo.c index add2d41d5..7810bf5a2 100644 --- a/src/video/ipod/SDL_ipodvideo.c +++ b/src/video/ipod/SDL_ipodvideo.c @@ -12,10 +12,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/maccommon/SDL_macevents.c b/src/video/maccommon/SDL_macevents.c index d82aef788..c3fff52b2 100644 --- a/src/video/maccommon/SDL_macevents.c +++ b/src/video/maccommon/SDL_macevents.c @@ -36,7 +36,6 @@ #include "SDL_events.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_syswm.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/maccommon/SDL_macgl.c b/src/video/maccommon/SDL_macgl.c index 9d64d3823..e0ff3e9d4 100644 --- a/src/video/maccommon/SDL_macgl.c +++ b/src/video/maccommon/SDL_macgl.c @@ -22,7 +22,6 @@ /* AGL implementation of SDL OpenGL support */ -#include "SDL_error.h" #include "SDL_lowvideo.h" #include "SDL_macgl_c.h" #include "SDL_loadso.h" diff --git a/src/video/maccommon/SDL_macmouse.c b/src/video/maccommon/SDL_macmouse.c index 3778e6141..929283309 100644 --- a/src/video/maccommon/SDL_macmouse.c +++ b/src/video/maccommon/SDL_macmouse.c @@ -33,9 +33,6 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_macmouse_c.h" diff --git a/src/video/maccommon/SDL_macwm.c b/src/video/maccommon/SDL_macwm.c index 67816a88e..28402bad5 100644 --- a/src/video/maccommon/SDL_macwm.c +++ b/src/video/maccommon/SDL_macwm.c @@ -29,7 +29,7 @@ #include #endif -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_macwm_c.h" void Mac_SetCaption(_THIS, const char *title, const char *icon) diff --git a/src/video/macdsp/SDL_dspvideo.c b/src/video/macdsp/SDL_dspvideo.c index 1478bd6c7..a502c04aa 100644 --- a/src/video/macdsp/SDL_dspvideo.c +++ b/src/video/macdsp/SDL_dspvideo.c @@ -137,11 +137,8 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_video.h" #include "SDL_blit.h" -#include "SDL_error.h" #include "SDL_syswm.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" diff --git a/src/video/macrom/SDL_romvideo.c b/src/video/macrom/SDL_romvideo.c index 082fbbfb7..6835751df 100644 --- a/src/video/macrom/SDL_romvideo.c +++ b/src/video/macrom/SDL_romvideo.c @@ -41,10 +41,7 @@ #include #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_syswm.h" #include "SDL_sysvideo.h" #include "SDL_romvideo.h" diff --git a/src/video/nanox/SDL_nximage.c b/src/video/nanox/SDL_nximage.c index 5a9b779e5..9871f57c4 100644 --- a/src/video/nanox/SDL_nximage.c +++ b/src/video/nanox/SDL_nximage.c @@ -25,10 +25,6 @@ clare@setabox.com */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" - #include "SDL_nximage_c.h" void NX_NormalUpdate (_THIS, int numrects, SDL_Rect * rects) diff --git a/src/video/nanox/SDL_nxmodes.c b/src/video/nanox/SDL_nxmodes.c index 61025f9f7..3e7febe85 100644 --- a/src/video/nanox/SDL_nxmodes.c +++ b/src/video/nanox/SDL_nxmodes.c @@ -24,8 +24,7 @@ clare@setabox.com */ -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_nxmodes_c.h" SDL_Rect ** NX_ListModes (_THIS, SDL_PixelFormat * format, Uint32 flags) diff --git a/src/video/nanox/SDL_nxmouse.c b/src/video/nanox/SDL_nxmouse.c index 581498893..08fae2d4b 100644 --- a/src/video/nanox/SDL_nxmouse.c +++ b/src/video/nanox/SDL_nxmouse.c @@ -24,8 +24,6 @@ clare@setabox.com */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_events_c.h" #include "SDL_nxmouse_c.h" diff --git a/src/video/nanox/SDL_nxvideo.c b/src/video/nanox/SDL_nxvideo.c index 190e9914f..5069d33bf 100644 --- a/src/video/nanox/SDL_nxvideo.c +++ b/src/video/nanox/SDL_nxvideo.c @@ -25,12 +25,10 @@ clare@setabox.com */ -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_thread.h" #include "SDL_video.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" -#include "SDL_thread.h" #define MWINCLUDECOLORS #include "SDL_nxvideo.h" diff --git a/src/video/nanox/SDL_nxwm.c b/src/video/nanox/SDL_nxwm.c index 5bb504827..65a6c41b6 100644 --- a/src/video/nanox/SDL_nxwm.c +++ b/src/video/nanox/SDL_nxwm.c @@ -25,7 +25,6 @@ */ #include "SDL_syswm.h" -#include "SDL_error.h" #include "SDL_events_c.h" #include "SDL_nxwm_c.h" diff --git a/src/video/os2fslib/SDL_os2fslib.c b/src/video/os2fslib/SDL_os2fslib.c index b1676de12..d98baa86a 100644 --- a/src/video/os2fslib/SDL_os2fslib.c +++ b/src/video/os2fslib/SDL_os2fslib.c @@ -23,10 +23,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/photon/SDL_ph_image.c b/src/video/photon/SDL_ph_image.c index 1ee9585c3..1429c41e5 100644 --- a/src/video/photon/SDL_ph_image.c +++ b/src/video/photon/SDL_ph_image.c @@ -23,10 +23,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_endian.h" #include "SDL_video.h" #include "SDL_pixels_c.h" diff --git a/src/video/photon/SDL_ph_modes.c b/src/video/photon/SDL_ph_modes.c index c84d73f15..dafca2d9f 100644 --- a/src/video/photon/SDL_ph_modes.c +++ b/src/video/photon/SDL_ph_modes.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_error.h" #include "SDL_ph_modes_c.h" static PgVideoModeInfo_t mode_info; diff --git a/src/video/photon/SDL_ph_mouse.c b/src/video/photon/SDL_ph_mouse.c index 7b6649989..4e1141f66 100644 --- a/src/video/photon/SDL_ph_mouse.c +++ b/src/video/photon/SDL_ph_mouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/photon/SDL_ph_video.c b/src/video/photon/SDL_ph_video.c index 9cb060397..027077448 100644 --- a/src/video/photon/SDL_ph_video.c +++ b/src/video/photon/SDL_ph_video.c @@ -23,15 +23,11 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" +#include "SDL_endian.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_video.h" #include "SDL_mouse.h" -#include "SDL_endian.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" diff --git a/src/video/photon/SDL_ph_wm.c b/src/video/photon/SDL_ph_wm.c index a8643e3d6..4610f3fcb 100644 --- a/src/video/photon/SDL_ph_wm.c +++ b/src/video/photon/SDL_ph_wm.c @@ -28,8 +28,6 @@ #include #include "SDL_version.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_video.h" #include "SDL_syswm.h" diff --git a/src/video/photon/SDL_phyuv.c b/src/video/photon/SDL_phyuv.c index ac59a2091..f70371aad 100644 --- a/src/video/photon/SDL_phyuv.c +++ b/src/video/photon/SDL_phyuv.c @@ -27,9 +27,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_phyuv_c.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/picogui/SDL_pgvideo.c b/src/video/picogui/SDL_pgvideo.c index 9cb0d7c47..94190819c 100644 --- a/src/video/picogui/SDL_pgvideo.c +++ b/src/video/picogui/SDL_pgvideo.c @@ -23,10 +23,6 @@ micahjd@users.sourceforge.net */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/ps2gs/SDL_gsevents.c b/src/video/ps2gs/SDL_gsevents.c index 6bc4500ec..acaef94ce 100644 --- a/src/video/ps2gs/SDL_gsevents.c +++ b/src/video/ps2gs/SDL_gsevents.c @@ -38,8 +38,6 @@ #include #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_mutex.h" #include "SDL_sysevents.h" #include "SDL_sysvideo.h" diff --git a/src/video/ps2gs/SDL_gsmouse.c b/src/video/ps2gs/SDL_gsmouse.c index 9567a1f31..c359a85f1 100644 --- a/src/video/ps2gs/SDL_gsmouse.c +++ b/src/video/ps2gs/SDL_gsmouse.c @@ -22,7 +22,6 @@ #include -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/ps2gs/SDL_gsvideo.c b/src/video/ps2gs/SDL_gsvideo.c index 78a972c2d..26f697c20 100644 --- a/src/video/ps2gs/SDL_gsvideo.c +++ b/src/video/ps2gs/SDL_gsvideo.c @@ -28,10 +28,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/ps2gs/SDL_gsyuv.c b/src/video/ps2gs/SDL_gsyuv.c index 62d31c777..7959a4dc9 100644 --- a/src/video/ps2gs/SDL_gsyuv.c +++ b/src/video/ps2gs/SDL_gsyuv.c @@ -28,9 +28,6 @@ #include #include /* For definition of PAGE_SIZE */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_gsyuv_c.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/qtopia/SDL_sysvideo.cc b/src/video/qtopia/SDL_sysvideo.cc index 3f78bb31f..8a7e29121 100644 --- a/src/video/qtopia/SDL_sysvideo.cc +++ b/src/video/qtopia/SDL_sysvideo.cc @@ -27,9 +27,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_timer.h" #include "SDL_QWin.h" diff --git a/src/video/quartz/SDL_QuartzEvents.m b/src/video/quartz/SDL_QuartzEvents.m index 6ccddfdbb..b908d15e3 100644 --- a/src/video/quartz/SDL_QuartzEvents.m +++ b/src/video/quartz/SDL_QuartzEvents.m @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" #include "SDL_QuartzVideo.h" #include // For wake from sleep detection diff --git a/src/video/riscos/SDL_riscosFullScreenVideo.c b/src/video/riscos/SDL_riscosFullScreenVideo.c index d52e3ffc2..f64f34a64 100644 --- a/src/video/riscos/SDL_riscosFullScreenVideo.c +++ b/src/video/riscos/SDL_riscosFullScreenVideo.c @@ -27,10 +27,6 @@ Implements RISC OS full screen display. */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/riscos/SDL_riscosmouse.c b/src/video/riscos/SDL_riscosmouse.c index 76599f455..2ea96dee2 100644 --- a/src/video/riscos/SDL_riscosmouse.c +++ b/src/video/riscos/SDL_riscosmouse.c @@ -27,8 +27,6 @@ Implements mouse cursor shape definitions and positioning */ -#include "SDL_stdlib.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" diff --git a/src/video/riscos/SDL_riscossprite.c b/src/video/riscos/SDL_riscossprite.c index e63a353ce..bfbc391d7 100644 --- a/src/video/riscos/SDL_riscossprite.c +++ b/src/video/riscos/SDL_riscossprite.c @@ -30,7 +30,7 @@ #include "kernel.h" #include "swis.h" -#include "SDL_stdlib.h" +#include "SDL_stdinc.h" #include "SDL_riscosvideo.h" extern void WIMP_ReadModeInfo(_THIS); diff --git a/src/video/riscos/SDL_riscostask.c b/src/video/riscos/SDL_riscostask.c index 5c99691ad..c5d72a0cb 100644 --- a/src/video/riscos/SDL_riscostask.c +++ b/src/video/riscos/SDL_riscostask.c @@ -34,8 +34,7 @@ #include "kernel.h" #include "swis.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_stdinc.h" #include "SDL_riscostask.h" #ifndef DISABLE_THREADS diff --git a/src/video/riscos/SDL_riscosvideo.c b/src/video/riscos/SDL_riscosvideo.c index d07d8a939..9f2872d10 100644 --- a/src/video/riscos/SDL_riscosvideo.c +++ b/src/video/riscos/SDL_riscosvideo.c @@ -29,13 +29,9 @@ into other source files. */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_syswm.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" +#include "SDL_syswm.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" diff --git a/src/video/riscos/SDL_wimpvideo.c b/src/video/riscos/SDL_wimpvideo.c index 99bf49769..ed72a0e08 100644 --- a/src/video/riscos/SDL_wimpvideo.c +++ b/src/video/riscos/SDL_wimpvideo.c @@ -27,10 +27,6 @@ Implements RISC OS Wimp display. */ -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/svga/SDL_svgaevents.c b/src/video/svga/SDL_svgaevents.c index 006c6fc9f..8f6d73869 100644 --- a/src/video/svga/SDL_svgaevents.c +++ b/src/video/svga/SDL_svgaevents.c @@ -34,9 +34,6 @@ #error You must choose your operating system here #endif -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" #include "SDL_svgavideo.h" diff --git a/src/video/svga/SDL_svgamouse.c b/src/video/svga/SDL_svgamouse.c index 2d5752997..0a9e05e63 100644 --- a/src/video/svga/SDL_svgamouse.c +++ b/src/video/svga/SDL_svgamouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_svgavideo.h" diff --git a/src/video/svga/SDL_svgavideo.c b/src/video/svga/SDL_svgavideo.c index d6fd79edb..c474c6e13 100644 --- a/src/video/svga/SDL_svgavideo.c +++ b/src/video/svga/SDL_svgavideo.c @@ -40,10 +40,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/vgl/SDL_vglmouse.c b/src/video/vgl/SDL_vglmouse.c index 15792f50b..04796f648 100644 --- a/src/video/vgl/SDL_vglmouse.c +++ b/src/video/vgl/SDL_vglmouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_vglvideo.h" diff --git a/src/video/vgl/SDL_vglvideo.c b/src/video/vgl/SDL_vglvideo.c index 2baa817df..df8a3f98f 100644 --- a/src/video/vgl/SDL_vglvideo.c +++ b/src/video/vgl/SDL_vglvideo.c @@ -33,10 +33,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c index 7c0a9a832..3a0ff11c2 100644 --- a/src/video/wincommon/SDL_sysevents.c +++ b/src/video/wincommon/SDL_sysevents.c @@ -22,13 +22,9 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_events.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_syswm.h" -#include "SDL_getenv.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" #include "SDL_sysvideo.h" diff --git a/src/video/wincommon/SDL_sysmouse.c b/src/video/wincommon/SDL_sysmouse.c index 6414e511a..d5a7e454d 100644 --- a/src/video/wincommon/SDL_sysmouse.c +++ b/src/video/wincommon/SDL_sysmouse.c @@ -22,9 +22,6 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_sysmouse_c.h" #include "SDL_events_c.h" diff --git a/src/video/wincommon/SDL_syswm.c b/src/video/wincommon/SDL_syswm.c index 87fb1cfae..7ef434563 100644 --- a/src/video/wincommon/SDL_syswm.c +++ b/src/video/wincommon/SDL_syswm.c @@ -23,9 +23,6 @@ #include "SDL_windows.h" #include "SDL_version.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_syswm.h" #include "SDL_syswm_c.h" diff --git a/src/video/wincommon/SDL_wingl.c b/src/video/wincommon/SDL_wingl.c index 286497ffb..c9753e372 100644 --- a/src/video/wincommon/SDL_wingl.c +++ b/src/video/wincommon/SDL_wingl.c @@ -22,12 +22,9 @@ /* WGL implementation of SDL OpenGL support */ -#include "SDL_stdlib.h" -#include "SDL_string.h" #ifdef HAVE_OPENGL #include "SDL_opengl.h" #endif -#include "SDL_error.h" #include "SDL_lowvideo.h" #include "SDL_wingl_c.h" diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c index ae9050708..bcb61f927 100644 --- a/src/video/windib/SDL_dibevents.c +++ b/src/video/windib/SDL_dibevents.c @@ -22,10 +22,8 @@ #include "SDL_windows.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_main.h" #include "SDL_events.h" -#include "SDL_error.h" #include "SDL_syswm.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c index 051afb4bc..ff512908b 100644 --- a/src/video/windib/SDL_dibvideo.c +++ b/src/video/windib/SDL_dibvideo.c @@ -34,10 +34,6 @@ extern HINSTANCE aygshell; #define CDS_FULLSCREEN 4 #endif -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_mutex.h" #include "SDL_syswm.h" #include "SDL_sysvideo.h" #include "SDL_sysevents.h" diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index 55c13f564..dcd065210 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -24,11 +24,9 @@ #include "directx.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" +#include "SDL_main.h" #include "SDL_events.h" #include "SDL_video.h" -#include "SDL_error.h" #include "SDL_syswm.h" #include "SDL_sysevents.h" #include "SDL_events_c.h" diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c index 89b1b5a75..3de46639d 100644 --- a/src/video/windx5/SDL_dx5video.c +++ b/src/video/windx5/SDL_dx5video.c @@ -20,7 +20,6 @@ slouken@libsdl.org */ -#include "SDL_windows.h" #include "directx.h" /* Not yet in the mingw32 cross-compile headers */ @@ -28,9 +27,6 @@ #define CDS_FULLSCREEN 4 #endif -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_events.h" #include "SDL_syswm.h" diff --git a/src/video/windx5/SDL_dx5yuv.c b/src/video/windx5/SDL_dx5yuv.c index 0cdc59b8c..ea395a686 100644 --- a/src/video/windx5/SDL_dx5yuv.c +++ b/src/video/windx5/SDL_dx5yuv.c @@ -22,9 +22,6 @@ /* This is the DirectDraw implementation of YUV video overlays */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_dx5yuv_c.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/wscons/SDL_wsconsmouse.c b/src/video/wscons/SDL_wsconsmouse.c index 03e8820d4..8cc145019 100644 --- a/src/video/wscons/SDL_wsconsmouse.c +++ b/src/video/wscons/SDL_wsconsmouse.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include - -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" diff --git a/src/video/wscons/SDL_wsconsvideo.c b/src/video/wscons/SDL_wsconsvideo.c index e648df3ab..ca851731f 100644 --- a/src/video/wscons/SDL_wsconsvideo.c +++ b/src/video/wscons/SDL_wsconsvideo.c @@ -28,10 +28,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/x11/SDL_x11dga.c b/src/video/x11/SDL_x11dga.c index 46bc0d25c..1998f934d 100644 --- a/src/video/x11/SDL_x11dga.c +++ b/src/video/x11/SDL_x11dga.c @@ -25,8 +25,6 @@ There will be a completely separate DGA driver that is fullscreen-only. */ -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_video.h" #include "SDL_cursor_c.h" #include "SDL_x11dga_c.h" diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index bea0db170..56304969c 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -33,8 +33,6 @@ #include #include -#include "SDL.h" -#include "SDL_string.h" #include "SDL_syswm.h" #include "SDL_sysevents.h" #include "SDL_sysvideo.h" diff --git a/src/video/x11/SDL_x11gl.c b/src/video/x11/SDL_x11gl.c index f07af7663..45cd2de1b 100644 --- a/src/video/x11/SDL_x11gl.c +++ b/src/video/x11/SDL_x11gl.c @@ -20,9 +20,6 @@ slouken@libsdl.org */ -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_x11video.h" #include "SDL_events_c.h" #include "SDL_x11dga_c.h" diff --git a/src/video/x11/SDL_x11image.c b/src/video/x11/SDL_x11image.c index 05cb9adfc..3392a06a6 100644 --- a/src/video/x11/SDL_x11image.c +++ b/src/video/x11/SDL_x11image.c @@ -23,9 +23,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_endian.h" #include "SDL_events_c.h" #include "SDL_x11image_c.h" diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c index 2c454e87a..eeb0a46c1 100644 --- a/src/video/x11/SDL_x11modes.c +++ b/src/video/x11/SDL_x11modes.c @@ -24,10 +24,7 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_timer.h" -#include "SDL_error.h" #include "SDL_events.h" #include "SDL_events_c.h" #include "SDL_x11video.h" diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c index 255e0833c..918bffcf3 100644 --- a/src/video/x11/SDL_x11mouse.c +++ b/src/video/x11/SDL_x11mouse.c @@ -23,9 +23,6 @@ #include #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_mouse.h" #include "SDL_events_c.h" #include "SDL_cursor_c.h" diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index 0635ea1eb..d03c30393 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -34,15 +34,11 @@ #include #endif -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" +#include "SDL_endian.h" #include "SDL_timer.h" #include "SDL_thread.h" #include "SDL_video.h" #include "SDL_mouse.h" -#include "SDL_endian.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" diff --git a/src/video/x11/SDL_x11wm.c b/src/video/x11/SDL_x11wm.c index 24f10ea60..bf76fd992 100644 --- a/src/video/x11/SDL_x11wm.c +++ b/src/video/x11/SDL_x11wm.c @@ -24,9 +24,6 @@ #include #include "SDL_version.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_timer.h" #include "SDL_video.h" #include "SDL_syswm.h" diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c index 666b86d9f..730dacefa 100644 --- a/src/video/x11/SDL_x11yuv.c +++ b/src/video/x11/SDL_x11yuv.c @@ -32,9 +32,6 @@ #endif #include -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_x11yuv_c.h" #include "SDL_yuvfuncs.h" diff --git a/src/video/xbios/SDL_xbios.c b/src/video/xbios/SDL_xbios.c index c00d06979..730f3df5b 100644 --- a/src/video/xbios/SDL_xbios.c +++ b/src/video/xbios/SDL_xbios.c @@ -34,10 +34,6 @@ #include #include -#include "SDL.h" -#include "SDL_stdlib.h" -#include "SDL_string.h" -#include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" diff --git a/src/video/xbios/SDL_xbios.h b/src/video/xbios/SDL_xbios.h index f70f9279f..82f52ce4a 100644 --- a/src/video/xbios/SDL_xbios.h +++ b/src/video/xbios/SDL_xbios.h @@ -23,7 +23,7 @@ #ifndef _SDL_xbios_h #define _SDL_xbios_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ diff --git a/src/video/xbios/SDL_xbios_centscreen.c b/src/video/xbios/SDL_xbios_centscreen.c index 5d65ee8f7..14218c91a 100644 --- a/src/video/xbios/SDL_xbios_centscreen.c +++ b/src/video/xbios/SDL_xbios_centscreen.c @@ -28,8 +28,6 @@ #include -#include "SDL_stdlib.h" -#include "SDL_string.h" #include "SDL_xbios.h" #include "SDL_xbios_centscreen.h" diff --git a/src/video/xbios/SDL_xbios_sb3.c b/src/video/xbios/SDL_xbios_sb3.c index 1c34b5294..8bca717c0 100644 --- a/src/video/xbios/SDL_xbios_sb3.c +++ b/src/video/xbios/SDL_xbios_sb3.c @@ -28,7 +28,7 @@ /*--- Includes ---*/ -#include "SDL_stdlib.h" +#include "SDL_stdinc.h" #include "SDL_xbios.h" #include "SDL_xbios_sb3.h"