Merge a couple of fixes from AudioScout's PR #156

milkytracker · Apr 14, 2018 · 792f703 · 792f703 · AreaScout · Apr 15, 2018
1 parent a091e55
commit 792f703
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/milkyplay/MilkyPlayCommon.h b/src/milkyplay/MilkyPlayCommon.h
@@ -89,7 +89,7 @@
 
 #define MP_NUMEFFECTS 4
 
-#if defined(WIN32) || defined(_WIN32_WCE) && !defined(__FORCE_SDL_AUDIO__)
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__FORCE_SDL_AUDIO__)
 	#define DRIVER_WIN32
 #elif defined(__APPLE__) && !defined(__FORCE_SDL_AUDIO__)
 	#define DRIVER_OSX

diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
@@ -162,7 +162,7 @@ enum SDLUserEvents
 	SDLUserEventMidiKeyUp,
 };
 
-static SDLCALL Uint32 timerCallback(Uint32 interval, void* param)
+static Uint32 SDLCALL timerCallback(Uint32 interval, void* param)
 {
 	if (!myTrackerScreen || !myTracker || !ticking)
 	{