Added SDL_log.h to SDL_internal.h so logging is available everywhere

2020-04-07 09:38:57 -07:00 · 2020-04-07 09:38:57 -07:00 · b6afbe6317
parent 488b94cb40
commit b6afbe6317
49 changed files with 4 additions and 53 deletions
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@ -22,7 +22,6 @@

 /* Simple error handling in SDL */

-#include "SDL_log.h"
 #include "SDL_error.h"
 #include "SDL_error_c.h"

--- a/src/SDL_internal.h
+++ b/src/SDL_internal.h
@ -116,6 +116,8 @@
 #define SDL_HAVE_YUV                    !SDL_LEAN_AND_MEAN
 #endif

+#include "SDL_log.h"
+
 #endif /* SDL_internal_h_ */

 /* vi: set ts=4 sw=4 expandtab: */
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@ -34,7 +34,6 @@

 /* Microsoft WAVE file loading routines */

-#include "SDL_log.h"
 #include "SDL_hints.h"
 #include "SDL_audio.h"
 #include "SDL_wave.h"
--- a/src/audio/disk/SDL_diskaudio.c
+++ b/src/audio/disk/SDL_diskaudio.c
@ -33,7 +33,6 @@
 #include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_diskaudio.h"
-#include "SDL_log.h"

 /* !!! FIXME: these should be SDL hints, not environment variables. */
 /* environment variables and defaults. */
--- a/src/audio/emscripten/SDL_emscriptenaudio.c
+++ b/src/audio/emscripten/SDL_emscriptenaudio.c
@ -23,7 +23,6 @@
 #if SDL_AUDIO_DRIVER_EMSCRIPTEN

 #include "SDL_audio.h"
-#include "SDL_log.h"
 #include "../SDL_audio_c.h"
 #include "SDL_emscriptenaudio.h"
 #include "SDL_assert.h"
--- a/src/audio/wasapi/SDL_wasapi.c
+++ b/src/audio/wasapi/SDL_wasapi.c
@ -29,7 +29,6 @@
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_assert.h"
-#include "SDL_log.h"

 #define COBJMACROS
 #include <mmdeviceapi.h>
--- a/src/audio/wasapi/SDL_wasapi_win32.c
+++ b/src/audio/wasapi/SDL_wasapi_win32.c
@ -35,7 +35,6 @@
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_assert.h"
-#include "SDL_log.h"

 #define COBJMACROS
 #include <mmdeviceapi.h>
--- a/src/audio/wasapi/SDL_wasapi_winrt.cpp
+++ b/src/audio/wasapi/SDL_wasapi_winrt.cpp
@ -41,7 +41,6 @@ extern "C" {
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_assert.h"
-#include "SDL_log.h"
 }

 #define COBJMACROS
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@ -19,11 +19,11 @@
  3. This notice may not be removed or altered from any source distribution.
 */
 #include "../../SDL_internal.h"
+
 #include "SDL_stdinc.h"
 #include "SDL_assert.h"
 #include "SDL_atomic.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_main.h"
 #include "SDL_timer.h"

--- a/src/core/winrt/SDL_winrtapp_direct3d.cpp
+++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp
@ -50,7 +50,6 @@ extern "C" {
 #include "SDL_assert.h"
 #include "SDL_events.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_main.h"
 #include "SDL_stdinc.h"
 #include "SDL_render.h"
--- a/src/filesystem/cocoa/SDL_sysfilesystem.m
+++ b/src/filesystem/cocoa/SDL_sysfilesystem.m
@ -32,7 +32,6 @@
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
 #include "SDL_filesystem.h"
-#include "SDL_log.h"

 char *
 SDL_GetBasePath(void)
--- a/src/joystick/android/SDL_sysjoystick.c
+++ b/src/joystick/android/SDL_sysjoystick.c
@ -31,7 +31,6 @@
 #include "SDL_hints.h"
 #include "SDL_assert.h"
 #include "SDL_timer.h"
-#include "SDL_log.h"
 #include "SDL_sysjoystick_c.h"
 #include "../SDL_joystick_c.h"
 #include "../../events/SDL_keyboard_c.h"
--- a/src/joystick/emscripten/SDL_sysjoystick.c
+++ b/src/joystick/emscripten/SDL_sysjoystick.c
@ -30,7 +30,6 @@
 #include "SDL_joystick.h"
 #include "SDL_assert.h"
 #include "SDL_timer.h"
-#include "SDL_log.h"
 #include "SDL_sysjoystick_c.h"
 #include "../SDL_joystick_c.h"

--- a/src/joystick/hidapi/SDL_hidapi_gamecube.c
+++ b/src/joystick/hidapi/SDL_hidapi_gamecube.c
@ -23,7 +23,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_haptic.h"
--- a/src/joystick/hidapi/SDL_hidapi_ps4.c
+++ b/src/joystick/hidapi/SDL_hidapi_ps4.c
@ -26,7 +26,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapi_steam.c
+++ b/src/joystick/hidapi/SDL_hidapi_steam.c
@ -23,7 +23,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@ -26,7 +26,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapi_xbox360.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360.c
@ -23,7 +23,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapi_xbox360w.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
@ -23,7 +23,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/src/joystick/hidapi/SDL_hidapi_xboxone.c
@ -23,7 +23,6 @@
 #ifdef SDL_JOYSTICK_HIDAPI

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_events.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@ -26,7 +26,6 @@
 #include "SDL_atomic.h"
 #include "SDL_endian.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_thread.h"
 #include "SDL_timer.h"
 #include "SDL_joystick.h"
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@ -36,7 +36,6 @@
 #include "SDL_assert.h"
 #include "SDL_endian.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_mutex.h"
 #include "../SDL_sysjoystick.h"
 #include "../../core/windows/SDL_windows.h"
--- a/src/joystick/windows/SDL_xinputjoystick.c
+++ b/src/joystick/windows/SDL_xinputjoystick.c
@ -26,7 +26,6 @@

 #include "SDL_assert.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_timer.h"
 #include "SDL_windowsjoystick_c.h"
 #include "SDL_xinputjoystick_c.h"
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@ -24,7 +24,6 @@

 #include "SDL_assert.h"
 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_render.h"
 #include "SDL_sysrender.h"
 #include "software/SDL_render_sw_c.h"
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@ -30,7 +30,6 @@
 #include "SDL_hints.h"
 #include "SDL_loadso.h"
 #include "SDL_syswm.h"
-#include "SDL_log.h"
 #include "SDL_assert.h"
 #include "../SDL_sysrender.h"
 #include "../SDL_d3dmath.h"
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@ -23,7 +23,6 @@
 #if SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_assert.h"
 #include "SDL_syswm.h"
 #include "SDL_metal.h"
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@ -23,7 +23,6 @@
 #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED

 #include "SDL_hints.h"
-#include "SDL_log.h"
 #include "SDL_assert.h"
 #include "SDL_opengl.h"
 #include "../SDL_sysrender.h"
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@ -23,7 +23,6 @@
 #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED

 #include "SDL_stdinc.h"
-#include "SDL_log.h"
 #include "SDL_opengl.h"
 #include "SDL_video.h"
 #include "SDL_shaders_gl.h"
--- a/src/thread/pthread/SDL_systhread.c
+++ b/src/thread/pthread/SDL_systhread.c
@ -47,7 +47,6 @@
 #endif
 #endif

-#include "SDL_log.h"
 #include "SDL_platform.h"
 #include "SDL_thread.h"
 #include "../SDL_thread_c.h"
--- a/src/thread/stdcpp/SDL_sysmutex.cpp
+++ b/src/thread/stdcpp/SDL_sysmutex.cpp
@ -23,7 +23,6 @@
 extern "C" {
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
-#include "SDL_log.h"
 }

 #include <system_error>
--- a/src/thread/stdcpp/SDL_systhread.cpp
+++ b/src/thread/stdcpp/SDL_systhread.cpp
@ -26,7 +26,6 @@ extern "C" {
 #include "SDL_thread.h"
 #include "../SDL_thread_c.h"
 #include "../SDL_systhread.h"
-#include "SDL_log.h"
 }

 #include <mutex>
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@ -31,7 +31,6 @@
 #endif

 #include "SDL_sysvideo.h"
-#include "SDL_log.h"
 #include "SDL_egl_c.h"
 #include "SDL_loadso.h"
 #include "SDL_hints.h"
--- a/src/video/SDL_vulkan_utils.c
+++ b/src/video/SDL_vulkan_utils.c
@ -22,7 +22,6 @@

 #include "SDL_vulkan_internal.h"
 #include "SDL_error.h"
-#include "SDL_log.h"

 /* !!! FIXME: this file doesn't match coding standards for SDL (brace position, etc). */

--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@ -26,7 +26,6 @@

 #include "SDL_hints.h"
 #include "SDL_events.h"
-#include "SDL_log.h"
 #include "SDL_androidtouch.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_touch_c.h"
--- a/src/video/cocoa/SDL_cocoaopengles.m
+++ b/src/video/cocoa/SDL_cocoaopengles.m
@ -25,7 +25,6 @@
 #include "SDL_cocoavideo.h"
 #include "SDL_cocoaopengles.h"
 #include "SDL_cocoaopengl.h"
-#include "SDL_log.h"

 /* EGL implementation of SDL OpenGL support */

--- a/src/video/directfb/SDL_DirectFB_video.h
+++ b/src/video/directfb/SDL_DirectFB_video.h
@ -31,7 +31,6 @@
 #include "SDL_scancode.h"
 #include "SDL_render.h"

-#include "SDL_log.h"

 #define DFB_VERSIONNUM(X, Y, Z)                     \
    ((X)*1000 + (Y)*100 + (Z))
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c
@ -27,9 +27,6 @@

 #include "SDL_kmsdrmdyn.h"

-#if DEBUG_DYNAMIC_KMSDRM
-#include "SDL_log.h"
-#endif

 #ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC

--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
@ -23,8 +23,6 @@

 #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL

-#include "SDL_log.h"
-
 #include "SDL_kmsdrmvideo.h"
 #include "SDL_kmsdrmopengles.h"
 #include "SDL_kmsdrmdyn.h"
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@ -26,7 +26,6 @@
 /* SDL internals */
 #include "../SDL_sysvideo.h"
 #include "SDL_syswm.h"
-#include "SDL_log.h"
 #include "SDL_hints.h"
 #include "../../events/SDL_events_c.h"
 #include "../../events/SDL_mouse_c.h"
--- a/src/video/raspberry/SDL_rpiopengles.c
+++ b/src/video/raspberry/SDL_rpiopengles.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_log.h"

 #if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL

--- a/src/video/vivante/SDL_vivantevulkan.c
+++ b/src/video/vivante/SDL_vivantevulkan.c
@ -35,7 +35,6 @@
 #include "SDL_loadso.h"
 #include "SDL_vivantevulkan.h"
 #include "SDL_syswm.h"
-#include "SDL_log.h"

 int VIVANTE_Vulkan_LoadLibrary(_THIS, const char *path)
 {
--- a/src/video/wayland/SDL_waylanddyn.c
+++ b/src/video/wayland/SDL_waylanddyn.c
@ -26,9 +26,6 @@

 #include "SDL_waylanddyn.h"

-#if DEBUG_DYNAMIC_WAYLAND
-#include "SDL_log.h"
-#endif

 #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC

--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@ -25,7 +25,6 @@

 #include "SDL_stdinc.h"
 #include "SDL_assert.h"
-#include "SDL_log.h"

 #include "../../core/unix/SDL_poll.h"
 #include "../../events/SDL_sysevents.h"
--- a/src/video/wayland/SDL_waylandtouch.c
+++ b/src/video/wayland/SDL_waylandtouch.c
@ -25,7 +25,6 @@

 #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH

-#include "SDL_log.h"
 #include "SDL_mouse.h"
 #include "SDL_keyboard.h"
 #include "SDL_waylandtouch.h"
--- a/src/video/windows/SDL_windowsmodes.c
+++ b/src/video/windows/SDL_windowsmodes.c
@ -24,7 +24,6 @@

 #include "SDL_windowsvideo.h"
 #include "../../../include/SDL_assert.h"
-#include "../../../include/SDL_log.h"

 /* Windows CE compatibility */
 #ifndef CDS_FULLSCREEN
--- a/src/video/windows/SDL_windowsopengles.c
+++ b/src/video/windows/SDL_windowsopengles.c
@ -25,7 +25,6 @@
 #include "SDL_windowsvideo.h"
 #include "SDL_windowsopengles.h"
 #include "SDL_windowsopengl.h"
-#include "SDL_log.h"

 /* EGL implementation of SDL OpenGL support */

--- a/src/video/winrt/SDL_winrtmouse.cpp
+++ b/src/video/winrt/SDL_winrtmouse.cpp
@ -39,7 +39,6 @@ extern "C" {
 #include "../../events/SDL_touch_c.h"
 #include "../SDL_sysvideo.h"
 #include "SDL_events.h"
-#include "SDL_log.h"
 }

 #include "../../core/winrt/SDL_winrtapp_direct3d.h"
--- a/src/video/winrt/SDL_winrtvideo.cpp
+++ b/src/video/winrt/SDL_winrtvideo.cpp
@ -67,7 +67,6 @@ extern "C" {
 #include "SDL_winrtmouse_c.h"
 #include "SDL_main.h"
 #include "SDL_system.h"
-//#include "SDL_log.h"


 /* Initialization/Query functions */
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@ -40,7 +40,6 @@

 #include "SDL_timer.h"
 #include "SDL_syswm.h"
-#include "SDL_log.h"

 #define _NET_WM_STATE_REMOVE    0l
 #define _NET_WM_STATE_ADD       1l