Another attempt at fixing MINGW32. Needs to test with CYGWIN

indilib · Nov 25, 2023 · 4729c8b · 4729c8b
1 parent a223fb6
commit 4729c8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/libs/indiclient/baseclient.cpp b/libs/indiclient/baseclient.cpp
@@ -317,7 +317,7 @@ bool BaseClient::connectServer()
 
     IDLog("INDI::BaseClient::connectServer: creating new connection...\n");
 
-#if !defined (_WIN32) && !defined (_WINDOWS)
+#if !defined (_WIN32)
     // System with unix support automatically connect over unix domain
     if (d->cServer != "localhost" || d->cServer != "127.0.0.1" || d->connectToHostAndWait("localhost:", d->cPort) == false)
 #endif

diff --git a/libs/indicore/indiutility.h b/libs/indicore/indiutility.h
@@ -64,7 +64,8 @@ inline static size_t indi_strlcpy(char * dst, const char * src, size_t maxlen)
 // C++
 #ifdef __cplusplus
 
-#if defined (_WIN32) || defined (_WINDOWS)
+// JM 2023.11.25: Not available in Vanilla Windows (Visual Studio 2022) but available with MINGW? How does this affect CYGWIN?
+#if defined (_WIN32) && !defined (__MINGW32__)
 typedef int mode_t;
 #endif