From 6ea5f864a38be523bc4a28fb1d4bc2e76644dcc9 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 2 Jan 2009 13:48:31 +0000 Subject: [PATCH] fixed two silly typo bugs --- build/win32/platform_specific_code/juce_win32_Windowing.cpp | 4 ++-- extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp | 5 ++--- juce_amalgamated.cpp | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp index 637fdbf420..17cfac9dff 100644 --- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp +++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp @@ -2314,8 +2314,8 @@ static bool juce_screenSaverEnabled = true; void Desktop::setScreenSaverEnabled (const bool isEnabled) throw() { juce_screenSaverEnabled = isEnabled; - SetThreadExecutionState (isEnabled ? (ES_DISPLAY_REQUIRED | ES_CONTINUOUS) - : ES_CONTINUOUS); + SetThreadExecutionState (isEnabled ? ES_CONTINUOUS + : (ES_DISPLAY_REQUIRED | ES_CONTINUOUS)); } bool Desktop::isScreenSaverEnabled() throw() diff --git a/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp b/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp index c41d93a38c..d2c00a8bec 100644 --- a/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp +++ b/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp @@ -49,7 +49,7 @@ #define PRAGMA_ALIGN_SUPPORTED 1 #endif -#include "../juce_PluginHeaders.h" +#include "../juce_IncludeCharacteristics.h" #if JucePlugin_Build_VST @@ -109,7 +109,6 @@ #endif #include "../juce_PluginHeaders.h" -#include "../../../../src/juce_appframework/audio/plugins/formats/juce_VSTMidiEventList.h" #ifdef _MSC_VER @@ -1490,7 +1489,7 @@ extern "C" __declspec (dllexport) void* main (audioMasterCallback audioMaster) #if JucePlugin_Build_RTAS BOOL WINAPI DllMainVST (HINSTANCE instance, DWORD dwReason, LPVOID) #else -extern "C" BOOL WINAPI DllMain (HINSTANCE hInstance, DWORD ul_reason_for_call, LPVOID lpReserved) +extern "C" BOOL WINAPI DllMain (HINSTANCE instance, DWORD dwReason, LPVOID) #endif { if (dwReason == DLL_PROCESS_ATTACH) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 2ca3a850d4..f90b7ff8b9 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -243559,8 +243559,8 @@ static bool juce_screenSaverEnabled = true; void Desktop::setScreenSaverEnabled (const bool isEnabled) throw() { juce_screenSaverEnabled = isEnabled; - SetThreadExecutionState (isEnabled ? (ES_DISPLAY_REQUIRED | ES_CONTINUOUS) - : ES_CONTINUOUS); + SetThreadExecutionState (isEnabled ? ES_CONTINUOUS + : (ES_DISPLAY_REQUIRED | ES_CONTINUOUS)); } bool Desktop::isScreenSaverEnabled() throw()