Fixed bug 5235 - All internal sources should include SDL_assert.h

Ryan C. Gordon

We should really stick this in SDL_internal.h or something so it's always available.

src/SDL_dataqueue.c

@@ -18,11 +18,10 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "./SDL_internal.h"
+
 #include "SDL.h"
 #include "./SDL_dataqueue.h"
-#include "SDL_assert.h"
 
 typedef struct SDL_DataQueuePacket
 {

src/SDL_internal.h

@@ -116,6 +116,7 @@
 #define SDL_HAVE_YUV                    !SDL_LEAN_AND_MEAN
 #endif
 
+#include "SDL_assert.h"
 #include "SDL_log.h"
 
 #endif /* SDL_internal_h_ */

src/audio/SDL_audiocvt.c

@@ -30,7 +30,6 @@
 #include "SDL_audio_c.h"
 
 #include "SDL_loadso.h"
-#include "SDL_assert.h"
 #include "../SDL_dataqueue.h"
 #include "SDL_cpuinfo.h"
 

src/audio/SDL_audiotypecvt.c

@@ -18,12 +18,11 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../SDL_internal.h"
+
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_cpuinfo.h"
-#include "SDL_assert.h"
 
 #ifdef __ARM_NEON
 #define HAVE_NEON_INTRINSICS 1

src/audio/alsa/SDL_alsa_audio.c

@@ -32,7 +32,6 @@
 #include <signal.h>             /* For kill() */
 #include <string.h>
 
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"

src/audio/android/SDL_androidaudio.c

@@ -24,7 +24,6 @@
 
 /* Output audio to Android */
 
-#include "SDL_assert.h"
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_androidaudio.h"

src/audio/coreaudio/SDL_coreaudio.m

@@ -29,7 +29,6 @@
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_coreaudio.h"
-#include "SDL_assert.h"
 #include "../../thread/SDL_systhread.h"
 
 #define DEBUG_COREAUDIO 0

src/audio/directsound/SDL_directsound.c

@@ -24,7 +24,6 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_loadso.h"
 #include "SDL_audio.h"

src/audio/emscripten/SDL_emscriptenaudio.c

@@ -25,7 +25,6 @@
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_emscriptenaudio.h"
-#include "SDL_assert.h"
 
 #include <emscripten/emscripten.h>
 

src/audio/haiku/SDL_haikuaudio.cc

@@ -36,7 +36,6 @@ extern "C"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_haikuaudio.h"
-#include "SDL_assert.h"
 
 }
 

src/audio/jack/SDL_jackaudio.c

@@ -18,12 +18,10 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_AUDIO_DRIVER_JACK
 
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"

src/audio/openslES/SDL_openslES.c

@@ -26,7 +26,6 @@
    https://googlesamples.github.io/android-audio-high-performance/guides/opensl_es.html
 */
 
-#include "SDL_assert.h"
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "../../core/android/SDL_android.h"

src/audio/pulseaudio/SDL_pulseaudio.c

@@ -26,7 +26,6 @@
    Stéphan Kochen: stephan .a.t. kochen.nl
 */
 #include "../../SDL_internal.h"
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 
 #if SDL_AUDIO_DRIVER_PULSEAUDIO

src/audio/wasapi/SDL_wasapi.c

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_AUDIO_DRIVER_WASAPI
@@ -28,7 +27,6 @@
 #include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
-#include "SDL_assert.h"
 
 #define COBJMACROS
 #include <mmdeviceapi.h>

src/audio/wasapi/SDL_wasapi_win32.c

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 /* This is code that Windows uses to talk to WASAPI-related system APIs.
@@ -34,7 +33,6 @@
 #include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
-#include "SDL_assert.h"
 
 #define COBJMACROS
 #include <mmdeviceapi.h>

src/audio/wasapi/SDL_wasapi_winrt.cpp

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 // This is C++/CX code that the WinRT port uses to talk to WASAPI-related
@@ -40,7 +39,6 @@ extern "C" {
 #include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
-#include "SDL_assert.h"
 }
 
 #define COBJMACROS

src/audio/winmm/SDL_winmm.c

@@ -27,7 +27,6 @@
 #include "../../core/windows/SDL_windows.h"
 #include <mmsystem.h>
 
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"

src/core/android/SDL_android.c

@@ -21,7 +21,6 @@
 #include "../../SDL_internal.h"
 
 #include "SDL_stdinc.h"
-#include "SDL_assert.h"
 #include "SDL_atomic.h"
 #include "SDL_hints.h"
 #include "SDL_main.h"

src/core/linux/SDL_evdev.c

@@ -39,7 +39,6 @@
 #include <linux/input.h>
 
 #include "SDL.h"
-#include "SDL_assert.h"
 #include "SDL_endian.h"
 #include "SDL_scancode.h"
 #include "../../events/SDL_events_c.h"

src/core/unix/SDL_poll.c

@@ -21,7 +21,6 @@
 
 #include "../../SDL_internal.h"
 
-#include "SDL_assert.h"
 #include "SDL_poll.h"
 
 #ifdef HAVE_POLL

src/core/windows/SDL_hid.c

@@ -22,7 +22,6 @@
 
 #ifndef __WINRT__
 
-#include "SDL_assert.h"
 #include "SDL_hid.h"
 
 

src/core/windows/SDL_windows.c

@@ -24,7 +24,6 @@
 
 #include "SDL_windows.h"
 #include "SDL_error.h"
-#include "SDL_assert.h"
 
 #include <objbase.h>  /* for CoInitialize/CoUninitialize (Win32 only) */
 

src/core/windows/SDL_xinput.c

@@ -20,7 +20,6 @@
 */
 #include "../../SDL_internal.h"
 
-#include "SDL_assert.h"
 #include "SDL_xinput.h"
 
 

src/core/winrt/SDL_winrtapp_direct3d.cpp

@@ -47,7 +47,6 @@ using namespace Windows::Phone::UI::Input;
 
 /* SDL includes */
 extern "C" {
-#include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_hints.h"
 #include "SDL_main.h"

src/events/SDL_keyboard.c

@@ -25,7 +25,6 @@
 #include "SDL_timer.h"
 #include "SDL_events.h"
 #include "SDL_events_c.h"
-#include "SDL_assert.h"
 #include "../video/SDL_sysvideo.h"
 
 

src/events/SDL_mouse.c

@@ -22,7 +22,6 @@
 
 /* General mouse handling code for SDL */
 
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "SDL_timer.h"
 #include "SDL_events.h"

src/events/SDL_quit.c

@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "../SDL_internal.h"
+
 #include "SDL_hints.h"
-#include "SDL_assert.h"
 
 /* General quit handling code for SDL */
 

src/events/SDL_touch.c

@@ -22,7 +22,6 @@
 
 /* General touch handling code for SDL */
 
-#include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "../video/SDL_sysvideo.h"

src/filesystem/haiku/SDL_sysfilesystem.cc

@@ -32,7 +32,6 @@
 
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
-#include "SDL_assert.h"
 #include "SDL_filesystem.h"
 
 char *

src/filesystem/windows/SDL_sysfilesystem.c

@@ -28,7 +28,6 @@
 #include "../../core/windows/SDL_windows.h"
 #include <shlobj.h>
 
-#include "SDL_assert.h"
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
 #include "SDL_filesystem.h"

src/haptic/SDL_haptic.c

@@ -23,7 +23,6 @@
 #include "SDL_syshaptic.h"
 #include "SDL_haptic_c.h"
 #include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */
-#include "SDL_assert.h"
 
 /* Global for SDL_windowshaptic.c */
 #if (defined(SDL_HAPTIC_DINPUT) && SDL_HAPTIC_DINPUT) || (defined(SDL_HAPTIC_XINPUT) && SDL_HAPTIC_XINPUT)

src/haptic/android/SDL_syshaptic.c

@@ -22,7 +22,6 @@
 
 #ifdef SDL_HAPTIC_ANDROID
 
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_syshaptic_c.h"
 #include "../SDL_syshaptic.h"

src/haptic/darwin/SDL_syshaptic.c

@@ -22,7 +22,6 @@
 
 #ifdef SDL_HAPTIC_IOKIT
 
-#include "SDL_assert.h"
 #include "SDL_stdinc.h"
 #include "SDL_haptic.h"
 #include "../SDL_syshaptic.h"

src/haptic/linux/SDL_syshaptic.c

@@ -22,7 +22,6 @@
 
 #ifdef SDL_HAPTIC_LINUX
 
-#include "SDL_assert.h"
 #include "SDL_haptic.h"
 #include "../SDL_syshaptic.h"
 #include "SDL_joystick.h"

src/haptic/windows/SDL_windowshaptic.c

@@ -22,7 +22,6 @@
 
 #if SDL_HAPTIC_DINPUT || SDL_HAPTIC_XINPUT
 
-#include "SDL_assert.h"
 #include "SDL_thread.h"
 #include "SDL_mutex.h"
 #include "SDL_timer.h"

src/haptic/windows/SDL_xinputhaptic.c

@@ -26,7 +26,6 @@
 
 #if SDL_HAPTIC_XINPUT
 
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "SDL_timer.h"
 #include "SDL_windowshaptic_c.h"

src/joystick/SDL_gamecontroller.c

@@ -23,7 +23,6 @@
 /* This is the game controller API for Simple DirectMedia Layer */
 
 #include "SDL_events.h"
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "SDL_timer.h"
 #include "SDL_sysjoystick.h"

src/joystick/SDL_joystick.c

@@ -26,7 +26,6 @@
 #include "SDL_atomic.h"
 #include "SDL_events.h"
 #include "SDL_sysjoystick.h"
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 
 #if !SDL_EVENTS_DISABLED

src/joystick/android/SDL_sysjoystick.c

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #ifdef SDL_JOYSTICK_ANDROID
@@ -29,7 +28,6 @@
 
 #include "SDL_joystick.h"
 #include "SDL_hints.h"
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_sysjoystick_c.h"
 #include "../SDL_joystick_c.h"

src/joystick/emscripten/SDL_sysjoystick.c

@@ -28,7 +28,6 @@
 #include "SDL_events.h"
 
 #include "SDL_joystick.h"
-#include "SDL_assert.h"
 #include "SDL_timer.h"
 #include "SDL_sysjoystick_c.h"
 #include "../SDL_joystick_c.h"

src/joystick/hidapi/SDL_hidapi_rumble.c

@@ -24,7 +24,6 @@
 
 /* Handle rumble on a separate thread so it doesn't block the application */
 
-#include "SDL_assert.h"
 #include "SDL_thread.h"
 #include "SDL_hidapijoystick_c.h"
 #include "SDL_hidapi_rumble.h"

src/joystick/hidapi/SDL_hidapijoystick.c

@@ -22,7 +22,6 @@
 
 #ifdef SDL_JOYSTICK_HIDAPI
 
-#include "SDL_assert.h"
 #include "SDL_atomic.h"
 #include "SDL_endian.h"
 #include "SDL_hints.h"

src/joystick/iphoneos/SDL_mfijoystick.m

@@ -21,7 +21,6 @@
 #include "../../SDL_internal.h"
 
 /* This is the iOS implementation of the SDL joystick API */
-#include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_joystick.h"
 #include "SDL_hints.h"

src/joystick/linux/SDL_sysjoystick.c

@@ -40,7 +40,6 @@
 #include <dirent.h>
 #include <linux/joystick.h>
 
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "SDL_joystick.h"
 #include "SDL_log.h"

src/joystick/windows/SDL_rawinputjoystick.c

@@ -33,7 +33,6 @@
 
 #if SDL_JOYSTICK_RAWINPUT
 
-#include "SDL_assert.h"
 #include "SDL_endian.h"
 #include "SDL_events.h"
 #include "SDL_hints.h"

src/joystick/windows/SDL_windowsjoystick.c

@@ -33,7 +33,6 @@
  * let it return 0 events. */
 
 #include "SDL_error.h"
-#include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_mutex.h"

src/joystick/windows/SDL_xinputjoystick.c

@@ -24,7 +24,6 @@
 
 #if SDL_JOYSTICK_XINPUT
 
-#include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "SDL_timer.h"
 #include "SDL_windowsjoystick_c.h"

src/locale/unix/SDL_syslocale.c

@@ -21,7 +21,6 @@
 
 #include "../../SDL_internal.h"
 #include "../SDL_syslocale.h"
-#include "SDL_assert.h"
 
 static void
 normalize_locale_str(char *dst, char *str, size_t buflen)

src/locale/windows/SDL_syslocale.c

@@ -22,7 +22,6 @@
 #include "../../SDL_internal.h"
 #include "../../core/windows/SDL_windows.h"
 #include "../SDL_syslocale.h"
-#include "SDL_assert.h"
 
 typedef BOOL (WINAPI *pfnGetUserPreferredUILanguages)(DWORD,PULONG,/*PZZWSTR*/WCHAR*,PULONG);
 #ifndef MUI_LANGUAGE_NAME

src/power/uikit/SDL_syspower.m

@@ -27,7 +27,6 @@
 
 #include "SDL_power.h"
 #include "SDL_timer.h"
-#include "SDL_assert.h"
 #include "SDL_syspower.h"
 
 #if !TARGET_OS_TV