From 7c6577bf23eb5ea6ea0197f32d0c0e9610299992 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 28 Aug 2009 23:53:02 +0200 Subject: [PATCH] ZynAddSubFX: fixed win32 compilation of FLTK and MXML Some platform-specific constants got renamed during sed-mass-replace. Fix this by reverting concerning constant names. (cherry picked from commit 78536d9065c30810ebace0df066bb8e9f6c1cf56) --- plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx | 4 ++-- plugins/zynaddsubfx/mxml/mxml-private.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx index 084b87d63..c65cec389 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx @@ -343,7 +343,7 @@ public: } HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG *pceltFetched) { - if (n > 0) return S_false; + if (n > 0) return S_FALSE; for (ULONG i = 0; i < celt; i++) { n++; rgelt->cfFormat = CF_HDROP; @@ -358,7 +358,7 @@ public: HRESULT __stdcall Skip(ULONG celt) { n += celt; - return (n == 0) ? S_OK : S_false; + return (n == 0) ? S_OK : S_FALSE; } HRESULT __stdcall Reset(void) { diff --git a/plugins/zynaddsubfx/mxml/mxml-private.c b/plugins/zynaddsubfx/mxml/mxml-private.c index 3d115ab9f..fa5258056 100644 --- a/plugins/zynaddsubfx/mxml/mxml-private.c +++ b/plugins/zynaddsubfx/mxml/mxml-private.c @@ -208,7 +208,7 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ { case DLL_PROCESS_ATTACH : /* Called on library initialization */ if ((_mxml_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) - return (false); + return (FALSE); break; case DLL_THREAD_DETACH : /* Called when a thread terminates */ @@ -227,7 +227,7 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ break; } - return (true); + return (TRUE); }