From c32ca2195de7280371f054259f457a34c95eaf23 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 8 Dec 2020 13:46:56 +1000
Subject: [PATCH 1/2] barrier: split the platform-specific argument parsing

Instead of one function with several ifdefs, split into several functions
to make the code more readable.

No functional changes.
---
 src/lib/barrier/ArgParser.cpp | 41 ++++++++++++++++++++++++++---------
 src/lib/barrier/ArgParser.h   |  3 +++
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/lib/barrier/ArgParser.cpp b/src/lib/barrier/ArgParser.cpp
index 5bf08b6c..9cd1b8da 100644
--- a/src/lib/barrier/ArgParser.cpp
+++ b/src/lib/barrier/ArgParser.cpp
@@ -133,10 +133,10 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv)
     return true;
 }
 
-bool
-ArgParser::parsePlatformArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i)
-{
 #if WINAPI_MSWINDOWS
+bool
+ArgParser::parseMSWindowsArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i)
+{
     if (isArg(i, argc, argv, NULL, "--service")) {
         LOG((CLOG_WARN "obsolete argument --service, use barrierd instead."));
         argsBase.m_shouldExit = true;
@@ -153,25 +153,46 @@ ArgParser::parsePlatformArg(ArgsBase& argsBase, const int& argc, const char* con
     }
 
     return true;
-#elif WINAPI_XWINDOWS
+}
+#endif
+
+#if WINAPI_CARBON
+bool
+ArgParser::parseCarbonArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i)
+{
+    // no options for carbon
+    return false;
+}
+#endif
+
+#if WINAPI_XWINDOWS
+bool
+ArgParser::parseXWindowsArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i)
+{
     if (isArg(i, argc, argv, "-display", "--display", 1)) {
         // use alternative display
         argsBase.m_display = argv[++i];
     }
-
     else if (isArg(i, argc, argv, NULL, "--no-xinitthreads")) {
         argsBase.m_disableXInitThreads = true;
-    }
-
-    else {
+    } else {
         // option not supported here
         return false;
     }
 
     return true;
+}
+#endif
+
+bool
+ArgParser::parsePlatformArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i)
+{
+#if WINAPI_MSWINDOWS
+    return parseMSWindowsArg(argsBase, argc, argv, i);
 #elif WINAPI_CARBON
-    // no options for carbon
-    return false;
+    return parseCarbonArg(argsBase, argc, argv, i);
+#elif WINAPI_XWINDOWS
+    return parseXWindowsArg(argsBase, argc, argv, i);
 #endif
 }
 
diff --git a/src/lib/barrier/ArgParser.h b/src/lib/barrier/ArgParser.h
index 239a20cd..c8e9e68d 100644
--- a/src/lib/barrier/ArgParser.h
+++ b/src/lib/barrier/ArgParser.h
@@ -53,6 +53,9 @@ private:
     bool                checkUnexpectedArgs();
 
     static ArgsBase&    argsBase() { return *m_argsBase; }
+    bool                parseMSWindowsArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i);
+    bool                parseCarbonArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i);
+    bool                parseXWindowsArg(ArgsBase& argsBase, const int& argc, const char* const* argv, int& i);
 
 private:
     App*                m_app;

From dec895e8d3a0838272e694d392416e59c058938c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 10 Dec 2020 10:10:36 +1000
Subject: [PATCH 2/2] cmake: move two windows #defines to the main cmake file

We have a check for windows here anyway, let's move the defines here and we
can drop it in the common header file. And since on Unix HAVE_CONFIG_H is
always defined, we can drop the else condition too.
---
 CMakeLists.txt          | 2 ++
 src/lib/common/common.h | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c56b30be..b90e790b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,6 +292,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     list (APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi)
 
     add_definitions (
+        /DSYSAPI_WIN32=1
+        /DWINAPI_MSWINDOWS=1
         /DWIN32
         /D_WINDOWS
         /D_CRT_SECURE_NO_WARNINGS
diff --git a/src/lib/common/common.h b/src/lib/common/common.h
index 5eac5684..2feea235 100644
--- a/src/lib/common/common.h
+++ b/src/lib/common/common.h
@@ -18,13 +18,8 @@
 
 #pragma once
 
-#if defined(_WIN32)
-#	define SYSAPI_WIN32 1
-#	define WINAPI_MSWINDOWS 1
-#elif HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 #	include "config.h"
-#else
-#	error "config.h missing"
 #endif
 
 // VC++ has built-in sized types