diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-28 08:33:58 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-28 08:33:58 +0200 |
| commit | 709bce6cf17d472e65afc845fff87267499d9ad7 (patch) | |
| tree | 801f8ae0b6790007daee6407e5c99e5d616e3340 /nxcompshad/src/X11.cpp | |
| parent | bc66da7141f51f0594334ad641272c7de7ff3cff (diff) | |
| parent | d9e2822f535f3f02adaf4bb935a64184b871efd7 (diff) | |
| download | nx-libs-709bce6cf17d472e65afc845fff87267499d9ad7.tar.gz nx-libs-709bce6cf17d472e65afc845fff87267499d9ad7.tar.bz2 nx-libs-709bce6cf17d472e65afc845fff87267499d9ad7.zip | |
Merge branch 'sunweaver-pr/drop-nxcompshad-cygwin-support' into 3.6.x
Attributes GH PR #489: https://github.com/ArcticaProject/nx-libs/pull/489
Diffstat (limited to 'nxcompshad/src/X11.cpp')
| -rw-r--r-- | nxcompshad/src/X11.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp index 3643df731..3031bde37 100644 --- a/nxcompshad/src/X11.cpp +++ b/nxcompshad/src/X11.cpp @@ -27,8 +27,6 @@ #include "config.h" #endif -#if !defined(__CYGWIN32__) && !defined(WIN32) - #define PANIC #define WARNING #undef TEST @@ -1594,5 +1592,3 @@ int anyEventPredicate(Display *display, XEvent *event, XPointer parameter) { return 1; } - -#endif /* !defined(__CYGWIN32__) && !defined(WIN32) */ |