From f94da16d0022e788b50cd7d504056d850b2e9436 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 7 Feb 2021 19:35:30 +0000
Subject: [PATCH] Fix showing UI bridges for a few systems

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile.dist.mk                | 5 ++++-
 source/utils/CarlaPipeUtils.cpp | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.dist.mk b/Makefile.dist.mk
index ebbdb7b78..87162dc44 100644
--- a/Makefile.dist.mk
+++ b/Makefile.dist.mk
@@ -67,11 +67,14 @@ _CARLA_HOST_FILES = \
 	carla-discovery-native$(APP_EXT) \
 	libcarla_utils$(LIB_EXT)
 
-# TODO plugin UIs on windows
 ifeq ($(MACOS),true)
 _CARLA_HOST_FILES += \
 	$(_PLUGIN_UIS:%=resources/%$(APP_EXT)) \
 	carla-bridge-lv2-cocoa$(APP_EXT)
+else ifeq ($(WIN32),true)
+# TODO plugin UIs on windows
+_CARLA_HOST_FILES += \
+	carla-bridge-lv2-windows$(APP_EXT)
 endif
 
 _CARLA_APP_FILES = \
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index 0bbc6d886..664afa7f7 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -767,7 +767,12 @@ bool CarlaPipeCommon::readNextLineAsUInt(uint32_t& value) const noexcept
 
     if (const char* const msg = _readlineblock(false))
     {
+#if (defined(__WORDSIZE) && __WORDSIZE < 64) || (defined(__SIZE_WIDTH__) && __SIZE_WIDTH__ < 64) || \
+      defined(CARLA_OS_WIN) || defined(CARLA_OS_MAC)
+        const long long aslong = std::atoll(msg);
+#else
         const long aslong = std::atol(msg);
+#endif
 
         if (aslong >= 0)
         {