From afe02166719ede2e122982dd74909e27cc001877 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 31 Oct 2019 12:20:18 +0100
Subject: [PATCH] MSVC compilation fixes

---
 radio/src/thirdparty/libopenui/src/libopenui_defines.h | 9 ++++++---
 radio/src/thirdparty/libopenui/src/libopenui_helpers.h | 7 ++++++-
 radio/src/thirdparty/libopenui/src/window.h            | 5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h
index c24cd90f6..d613b2bdc 100644
--- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h
+++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h
@@ -75,9 +75,12 @@
 #define GET_BLUE(color) \
   (((color) & 0x001F) << 3)
 
-// remove windows default definitions
-#undef OPAQUE
-#undef RGB
+#ifndef __GNUC__
+  #include <windows.h>
+  // remove windows default definitions
+  #undef OPAQUE
+  #undef RGB
+#endif
 
 #define OPACITY_MAX                    0x0F
 #define OPACITY(x)                     ((x)<<24)
diff --git a/radio/src/thirdparty/libopenui/src/libopenui_helpers.h b/radio/src/thirdparty/libopenui/src/libopenui_helpers.h
index ed70ddd07..d93619683 100644
--- a/radio/src/thirdparty/libopenui/src/libopenui_helpers.h
+++ b/radio/src/thirdparty/libopenui/src/libopenui_helpers.h
@@ -22,6 +22,11 @@
 
 #include <string>
 
+#if defined(min)
+  #undef min
+  #undef max
+#endif
+
 template<class T>
 inline T min(T a, T b)
 {
@@ -51,7 +56,7 @@ inline int divRoundClosest(const int n, const int d)
 inline std::string TEXT_AT_INDEX(const char * val, uint8_t idx)
 {
   const char * start = val + 1 + idx * val[0];
-  return std::string(start, min<uint8_t>(val[0], strlen(start)));
+  return std::string(start, min<uint8_t>(val[0], (uint8_t)strlen(start)));
 }
 
 #endif
diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h
index e86d3111c..37a358a44 100644
--- a/radio/src/thirdparty/libopenui/src/window.h
+++ b/radio/src/thirdparty/libopenui/src/window.h
@@ -33,6 +33,11 @@
 
 typedef uint32_t WindowFlags;
 
+#if !defined(_GNUC_)
+  #undef OPAQUE
+  #undef TRANSPARENT
+#endif
+
 constexpr WindowFlags OPAQUE =                1 << 0;
 constexpr WindowFlags TRANSPARENT =           1 << 1;
 constexpr WindowFlags NO_SCROLLBAR =          1 << 2;