From 9b4db2b8aa45b4cdf52b8ed9cbfe96d7b3d1a718 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 12 Apr 2016 18:11:36 -0400 Subject: [PATCH] Patched to compile on various platforms. --- src/audio/pulseaudio/SDL_pulseaudio.c | 2 +- src/haptic/windows/SDL_xinputhaptic.c | 2 +- src/joystick/psp/SDL_sysjoystick.c | 2 +- src/joystick/windows/SDL_windowsjoystick.c | 2 +- src/main/haiku/SDL_BeApp.cc | 2 +- src/video/cocoa/SDL_cocoamousetap.m | 2 +- src/video/psp/SDL_pspevents.c | 2 +- src/video/winrt/SDL_winrtevents.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c index 00aad1b99a5a0..fdf38c8177a8b 100644 --- a/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/src/audio/pulseaudio/SDL_pulseaudio.c @@ -46,7 +46,7 @@ #include "../SDL_audio_c.h" #include "SDL_pulseaudio.h" #include "SDL_loadso.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" #if (PA_API_VERSION < 12) /** Return non-zero if the passed state is one of the connected states */ diff --git a/src/haptic/windows/SDL_xinputhaptic.c b/src/haptic/windows/SDL_xinputhaptic.c index 3a2bbfb01a801..5b0cb8c9b45f5 100644 --- a/src/haptic/windows/SDL_xinputhaptic.c +++ b/src/haptic/windows/SDL_xinputhaptic.c @@ -33,7 +33,7 @@ #include "SDL_xinputhaptic_c.h" #include "../../core/windows/SDL_xinput.h" #include "../../joystick/windows/SDL_windowsjoystick_c.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" /* * Internal stuff. diff --git a/src/joystick/psp/SDL_sysjoystick.c b/src/joystick/psp/SDL_sysjoystick.c index 1c7180e778655..352960edfaa2f 100644 --- a/src/joystick/psp/SDL_sysjoystick.c +++ b/src/joystick/psp/SDL_sysjoystick.c @@ -36,7 +36,7 @@ #include "SDL_error.h" #include "SDL_mutex.h" #include "SDL_timer.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" /* Current pad state */ static SceCtrlData pad = { .Lx = 0, .Ly = 0, .Buttons = 0 }; diff --git a/src/joystick/windows/SDL_windowsjoystick.c b/src/joystick/windows/SDL_windowsjoystick.c index 74a25f965cccc..cc61ec9eb5c5b 100644 --- a/src/joystick/windows/SDL_windowsjoystick.c +++ b/src/joystick/windows/SDL_windowsjoystick.c @@ -41,7 +41,7 @@ #include "SDL_hints.h" #include "SDL_joystick.h" #include "../SDL_sysjoystick.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" #if !SDL_EVENTS_DISABLED #include "../../events/SDL_events_c.h" #endif diff --git a/src/main/haiku/SDL_BeApp.cc b/src/main/haiku/SDL_BeApp.cc index 32fd6e892e638..619ad38197ecf 100644 --- a/src/main/haiku/SDL_BeApp.cc +++ b/src/main/haiku/SDL_BeApp.cc @@ -33,7 +33,7 @@ #include "SDL_BeApp.h" #include "SDL_timer.h" #include "SDL_error.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" #include "../../video/haiku/SDL_BWin.h" diff --git a/src/video/cocoa/SDL_cocoamousetap.m b/src/video/cocoa/SDL_cocoamousetap.m index 0ab98ed064fff..f1bd0e8d2d5b8 100644 --- a/src/video/cocoa/SDL_cocoamousetap.m +++ b/src/video/cocoa/SDL_cocoamousetap.m @@ -33,7 +33,7 @@ #include "SDL_keyboard.h" #include "SDL_cocoavideo.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" #include "../../events/SDL_mouse_c.h" diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c index 931aeaf76c514..71267272d622f 100644 --- a/src/video/psp/SDL_pspevents.c +++ b/src/video/psp/SDL_pspevents.c @@ -32,7 +32,7 @@ #include "SDL_pspvideo.h" #include "SDL_pspevents_c.h" #include "SDL_keyboard.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" #include #ifdef PSPIRKEYB diff --git a/src/video/winrt/SDL_winrtevents.cpp b/src/video/winrt/SDL_winrtevents.cpp index 093adfd38b6b9..8a480cbe36245 100644 --- a/src/video/winrt/SDL_winrtevents.cpp +++ b/src/video/winrt/SDL_winrtevents.cpp @@ -38,7 +38,7 @@ using Windows::UI::Core::CoreCursor; #include "../../core/winrt/SDL_winrtapp_xaml.h" #include "SDL_assert.h" #include "SDL_system.h" -#include "../thread/SDL_systhread.h" +#include "../../thread/SDL_systhread.h" extern "C" { #include "../SDL_sysvideo.h"