aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src/Proxy.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:17:37 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:17:37 +0200
commit00711f914d4b0ca76ca66c0225f257d6192807e2 (patch)
treeeb058b5ebd1d644528831ec37648bfba31070cfb /nxcomp/src/Proxy.cpp
parent9815f32d5c7c397c5a27a53764565beda2d007c2 (diff)
parentff0c2b1484e6e8a9f47d4ba78bbff54bf734c2f1 (diff)
downloadnx-libs-00711f914d4b0ca76ca66c0225f257d6192807e2.tar.gz
nx-libs-00711f914d4b0ca76ca66c0225f257d6192807e2.tar.bz2
nx-libs-00711f914d4b0ca76ca66c0225f257d6192807e2.zip
Merge branch 'vatral-support_cygwin64' into 3.6.x
Attributes GH PR #1008: https://github.com/ArcticaProject/nx-libs/pull/1008
Diffstat (limited to 'nxcomp/src/Proxy.cpp')
-rw-r--r--nxcomp/src/Proxy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 7f72fae3f..1713e308b 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -44,7 +44,7 @@
#include "Misc.h"
-#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
+#if defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
#include <netinet/in_systm.h>
#endif
@@ -788,7 +788,7 @@ const char *Proxy::getComputerName()
const char *hostname = NULL;
- #ifdef __CYGWIN32__
+ #if defined(__CYGWIN__) || defined(__CYGWIN32__)
hostname = getenv("COMPUTERNAME");