From 1d9161d55ef63c53128f21074c91a099a0804ef4 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 3 Aug 2014 18:00:14 +0100 Subject: [PATCH] Reworked START_JUCE_APPLICATION to work on Windows if windows.h has been included after the juce headers. --- modules/juce_events/messages/juce_Initialisation.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/juce_events/messages/juce_Initialisation.h b/modules/juce_events/messages/juce_Initialisation.h index 6bdb548c39..d3302dd74c 100644 --- a/modules/juce_events/messages/juce_Initialisation.h +++ b/modules/juce_events/messages/juce_Initialisation.h @@ -93,17 +93,11 @@ public: #else #if JUCE_WINDOWS && ! defined (_CONSOLE) - #if defined (WINAPI) || defined (_WINDOWS_) - #define JUCE_MAIN_FUNCTION int __stdcall WinMain (HINSTANCE, HINSTANCE, const LPSTR, int) - #elif defined (_UNICODE) - #define JUCE_MAIN_FUNCTION int __stdcall WinMain (void*, void*, const wchar_t*, int) - #else - #define JUCE_MAIN_FUNCTION int __stdcall WinMain (void*, void*, const char*, int) - #endif - #define JUCE_MAIN_FUNCTION_ARGS + #define JUCE_MAIN_FUNCTION int __stdcall WinMain (struct HINSTANCE__*, struct HINSTANCE__*, char*, int) + #define JUCE_MAIN_FUNCTION_ARGS #else - #define JUCE_MAIN_FUNCTION int main (int argc, char* argv[]) - #define JUCE_MAIN_FUNCTION_ARGS argc, (const char**) argv + #define JUCE_MAIN_FUNCTION int main (int argc, char* argv[]) + #define JUCE_MAIN_FUNCTION_ARGS argc, (const char**) argv #endif #define START_JUCE_APPLICATION(AppClass) \