DPF

commit 4772a3846a83e194d136f84305b5a054a8be2f35
parent e35376a2268bb7f1e08b141b5420f48b2ded6d51
Author: falkTX <falktx@falktx.com>
Date:   Tue, 23 Jan 2024 20:57:30 +0100

Fix build with -Werror=undef

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
distrho/src/DistrhoPluginChecks.h
 | 
11
+++++++++++
M
distrho/src/DistrhoPluginLV2export.cpp
 | 
6
+++---
M
distrho/src/DistrhoPluginVST2.cpp
 | 
8
++++----

3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/distrho/src/DistrhoPluginChecks.h b/distrho/src/DistrhoPluginChecks.h
@@ -199,6 +199,17 @@
 #endif
 
 // -----------------------------------------------------------------------
+// Other UI defaults
+
+#ifndef DISTRHO_UI_USE_CAIRO
+# define DISTRHO_UI_USE_CAIRO 0
+#endif
+
+#ifndef DISTRHO_UI_USE_CUSTOM
+# define DISTRHO_UI_USE_CUSTOM 0
+#endif
+
+// -----------------------------------------------------------------------
 // Prevent users from messing about with DPF internals
 
 #ifdef DISTRHO_UI_IS_STANDALONE
diff --git a/distrho/src/DistrhoPluginLV2export.cpp b/distrho/src/DistrhoPluginLV2export.cpp
@@ -75,11 +75,11 @@
 #endif
 
 #if DISTRHO_PLUGIN_HAS_EMBED_UI
-# if DISTRHO_OS_HAIKU
+# if defined(DISTRHO_OS_HAIKU)
 #  define DISTRHO_LV2_UI_TYPE "BeUI"
-# elif DISTRHO_OS_MAC
+# elif defined(DISTRHO_OS_MAC)
 #  define DISTRHO_LV2_UI_TYPE "CocoaUI"
-# elif DISTRHO_OS_WINDOWS
+# elif defined(DISTRHO_OS_WINDOWS)
 #  define DISTRHO_LV2_UI_TYPE "WindowsUI"
 # else
 #  define DISTRHO_LV2_UI_TYPE "X11UI"
diff --git a/distrho/src/DistrhoPluginVST2.cpp b/distrho/src/DistrhoPluginVST2.cpp
@@ -429,7 +429,7 @@ public:
             memset(parameterChecks, 0, sizeof(bool)*parameterCount);
         }
 
-      #if DISTRHO_OS_MAC
+      #ifdef DISTRHO_OS_MAC
        #ifdef __LP64__
         fUsingNsView = true;
        #else
@@ -627,7 +627,7 @@ public:
             delete fVstUI; // for hosts which don't pair create/destroy calls (Minihost Modular)
             fVstUI = nullptr;
 
-           #if DISTRHO_OS_MAC
+           #ifdef DISTRHO_OS_MAC
             if (! fUsingNsView)
             {
                 d_stderr("Host doesn't support hasCockosViewAsConfig, cannot use UI");
@@ -917,7 +917,7 @@ public:
         case VST_EFFECT_OPCODE_SUPPORTS:
             if (const char* const canDo = (const char*)ptr)
             {
-               #if DISTRHO_OS_MAC && DISTRHO_PLUGIN_HAS_UI
+               #if defined(DISTRHO_OS_MAC) && DISTRHO_PLUGIN_HAS_UI
                 if (std::strcmp(canDo, "hasCockosViewAsConfig") == 0)
                 {
                     fUsingNsView = true;
@@ -1140,7 +1140,7 @@ private:
     UIVst*   fVstUI;
     vst_rect fVstRect;
     float    fLastScaleFactor;
-   #if DISTRHO_OS_MAC
+   #ifdef DISTRHO_OS_MAC
     bool fUsingNsView;
    #endif
    #if DISTRHO_PLUGIN_WANT_MIDI_INPUT