From c32142a215f234e8e015edfd9c9ad9da5acdf7fd Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Fri, 5 Mar 2021 18:02:05 +0000
Subject: [PATCH] Windows:  Fixed a build error and some unreachable code
 warnings when JUCE_WIN_PER_MONITOR_DPI_AWARE=0

---
 .../native/juce_win32_Windowing.cpp            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
index b5dd25e685..f18b890f43 100644
--- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
@@ -435,8 +435,7 @@ static bool isPerMonitorDPIAwareProcess()
 {
    #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE
     return false;
-   #endif
-
+   #else
     static bool dpiAware = []() -> bool
     {
         setDPIAwareness();
@@ -451,15 +450,15 @@ static bool isPerMonitorDPIAwareProcess()
     }();
 
     return dpiAware;
+   #endif
 }
 
 static bool isPerMonitorDPIAwareWindow (HWND nativeWindow)
 {
    #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE
-    ignoreUnused (h);
+    ignoreUnused (nativeWindow);
     return false;
-   #endif
-
+   #else
     setDPIAwareness();
 
     if (getWindowDPIAwarenessContext != nullptr
@@ -470,14 +469,14 @@ static bool isPerMonitorDPIAwareWindow (HWND nativeWindow)
     }
 
     return isPerMonitorDPIAwareProcess();
+   #endif
 }
 
 static bool isPerMonitorDPIAwareThread()
 {
    #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE
     return false;
-   #endif
-
+   #else
     setDPIAwareness();
 
     if (getThreadDPIAwarenessContext != nullptr
@@ -488,6 +487,7 @@ static bool isPerMonitorDPIAwareThread()
     }
 
     return isPerMonitorDPIAwareProcess();
+   #endif
 }
 
 static double getGlobalDPI()
@@ -1949,8 +1949,7 @@ public:
     {
        #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE
         return 1.0;
-       #endif
-
+       #else
         if (! isPerMonitorDPIAwareWindow (hwnd))
             return 1.0;
 
@@ -1964,6 +1963,7 @@ public:
         }
 
         return scaleFactor;
+       #endif
     }
 
 private: