diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:17:37 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:17:37 +0200 |
| commit | 00711f914d4b0ca76ca66c0225f257d6192807e2 (patch) | |
| tree | eb058b5ebd1d644528831ec37648bfba31070cfb /nxcomp/src/Socket.cpp | |
| parent | 9815f32d5c7c397c5a27a53764565beda2d007c2 (diff) | |
| parent | ff0c2b1484e6e8a9f47d4ba78bbff54bf734c2f1 (diff) | |
| download | nx-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/Socket.cpp')
| -rw-r--r-- | nxcomp/src/Socket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nxcomp/src/Socket.cpp b/nxcomp/src/Socket.cpp index 8be04d76d..34fdea634 100644 --- a/nxcomp/src/Socket.cpp +++ b/nxcomp/src/Socket.cpp @@ -30,7 +30,7 @@ #include <sys/types.h> #include <sys/utsname.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 @@ -65,7 +65,7 @@ // disabled when running on MacOS/X. // -#ifdef __CYGWIN32__ +#if defined(__CYGWIN__) || defined(__CYGWIN32__) #define TIOCOUTQ ((unsigned int) -1) #endif @@ -101,7 +101,7 @@ int GetKernelStep() // in the relevant OS dependent functions. // - #if defined(__CYGWIN32__) || defined(__APPLE__) + #if defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__APPLE__) _kernelStep = 0; @@ -183,7 +183,7 @@ int GetKernelStep() } } - #endif /* #if defined(__CYGWIN32__) || defined(__APPLE__) */ + #endif /* #if defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__APPLE__) */ } return _kernelStep; |