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/ServerChannel.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/ServerChannel.cpp')
| -rw-r--r-- | nxcomp/src/ServerChannel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp index 0c99c9d33..4ee83507d 100644 --- a/nxcomp/src/ServerChannel.cpp +++ b/nxcomp/src/ServerChannel.cpp @@ -6972,7 +6972,7 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char // 0600 mask doesn't seem to work). // - #if defined(__CYGWIN32__) || defined(__APPLE__) + #if defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(__APPLE__) int permissions = 0777; @@ -7047,7 +7047,7 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char } else { - #ifndef __CYGWIN32__ + #if !(defined(__CYGWIN__) || defined(__CYGWIN32__)) #ifdef WARNING *logofs << "handleShmemRequest: WARNING! Can't create the shared " |