replace CONFIG_CYGWIN with Q_OS_WIN

MythTV · Jan 6, 2022 · fb33770 · fb33770
1 parent c7cf422
commit fb33770
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -7,6 +7,7 @@
 #include <typeinfo>
 
 // Qt headers
+#include <QtGlobal>
 #include <QCoreApplication>
 #include <QFile>
 #include <QList>
@@ -26,7 +27,7 @@
 
 #ifdef USING_DARWIN_DA
 #include "mediamonitor-darwin.h"
-#elif CONFIG_CYGWIN || defined(_WIN32)
+#elif defined(Q_OS_WIN)
 #include "mediamonitor-windows.h"
 #else
 #include "mediamonitor-unix.h"
@@ -87,12 +88,10 @@ MediaMonitor* MediaMonitor::GetMediaMonitor(void)
 
 #ifdef USING_DARWIN_DA
     s_monitor = new MediaMonitorDarwin(nullptr, MONITOR_INTERVAL, true);
-#else
-  #if CONFIG_CYGWIN || defined(_WIN32)
+#elif defined(Q_OS_WIN)
     s_monitor = new MediaMonitorWindows(nullptr, MONITOR_INTERVAL, true);
-  #else
+#else
     s_monitor = new MediaMonitorUnix(nullptr, MONITOR_INTERVAL, true);
-  #endif
 #endif
 
     return s_monitor;

diff --git a/mythtv/libs/libmythbase/mythsystemlegacy.cpp b/mythtv/libs/libmythbase/mythsystemlegacy.cpp
@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 // QT headers
+#include <QtGlobal>
 #include <QCoreApplication>
 
 // libmythbase headers
@@ -43,7 +44,7 @@
 #include "mythevent.h"
 #include "mythlogging.h"
 
-#if CONFIG_CYGWIN || defined(_WIN32)
+#ifdef Q_OS_WIN
 #include "mythsystemwindows.h"
 #else
 #include "mythsystemunix.h"
@@ -56,7 +57,7 @@
 
 void MythSystemLegacy::initializePrivate(void)
 {
-#if CONFIG_CYGWIN || defined(_WIN32)
+#ifdef Q_OS_WIN
     d = new MythSystemLegacyWindows(this);
 #else
     d = new MythSystemLegacyUnix(this);

diff --git a/mythtv/settings.pro b/mythtv/settings.pro
@@ -194,7 +194,6 @@ win32 {
 
         CONFIG += cygwin
         QMAKE_EXTENSION_SHLIB=dll.a
-        DEFINES += CONFIG_CYGWIN
     }
 
 } else {