diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
| commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
| tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/NXshm.c | |
| parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
| parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
| download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip | |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXshm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 6ce2e48e8..246d39355 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -96,7 +96,7 @@ ShmExtensionInit(void) #endif #ifdef NXAGENT_SERVER - if (!nxagentOption(SharedMemory)) + if (nxagentOption(SharedMemory) == False) { return; } @@ -207,11 +207,11 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) { /* Careful! This wrapper DEACTIVATES the trap! */ - nxagentShmTrap = False; + nxagentShmTrap = 0; nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data); - nxagentShmTrap = True; + nxagentShmTrap = 1; return; } @@ -476,11 +476,11 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr) { PixmapPtr result; - nxagentShmPixmapTrap = True; + nxagentShmPixmapTrap = 1; result = nxagent_fbShmCreatePixmap(pScreen, width, height, depth, addr); - nxagentShmPixmapTrap = False; + nxagentShmPixmapTrap = 0; return result; } @@ -553,11 +553,11 @@ ProcShmDispatch (register ClientPtr client) { int result; - nxagentShmTrap = True; + nxagentShmTrap = 1; result = nxagent_ProcShmDispatch(client); - nxagentShmTrap = False; + nxagentShmTrap = 0; return result; } @@ -591,13 +591,13 @@ SProcShmDispatch (client) #endif #ifdef NXAGENT_SERVER - nxagentShmTrap = True; + nxagentShmTrap = 1; #endif result = SProcShmPutImage(client); #ifdef NXAGENT_SERVER - nxagentShmTrap = False; + nxagentShmTrap = 0; #endif #ifdef TEST |