diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-01 21:46:32 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-01 21:46:32 +0100 |
| commit | ae40bb9c4e579ad947dc4a18d042e725b912c128 (patch) | |
| tree | 805cb63732464b54c2ae3318b5f07c7b78150c03 /nxcompshad | |
| parent | a5a0a5c29bf7c1d1e346b5813e6696a5f0522136 (diff) | |
| parent | 66ef3e46f4f38e5755ae32ab49d065a2707e90e7 (diff) | |
| download | nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.tar.gz nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.tar.bz2 nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.zip | |
Merge branch 'mjtrangoni-WIP-travis' into 3.6.x
Attributes GH PR #624: https://github.com/ArcticaProject/nx-libs/pull/624
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/src/X11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp index 3031bde37..8c5dbd5f6 100644 --- a/nxcompshad/src/X11.cpp +++ b/nxcompshad/src/X11.cpp @@ -363,7 +363,7 @@ void Poller::shmInit(void) shminfo_ -> shmaddr = (char *)shmat(shminfo_ -> shmid, 0, 0); - if (shminfo_ -> shmaddr < 0) + if (shminfo_ -> shmaddr < (void *)0) { logWarning("Poller::shmInit", "Couldn't attach to shm segment."); } |