diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
| commit | b61934be2e9b4a8d3112270b0e691d47f99ba39f (patch) | |
| tree | d0cb58feeddb553a6e9ab6daea5056bd0221eb2b /nx-X11/programs/Xserver/hw/nxagent/NXshm.c | |
| parent | 427ac344c53acf4cb361f24e1df771137f83ea6b (diff) | |
| parent | 16cd2bbe1c4425e3fa557f9ca0723aa94a50b071 (diff) | |
| download | nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.gz nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.bz2 nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.zip | |
Merge branch 'uli42-pr/misc' into 3.6.x
Attributes GH PR #766: https://github.com/ArcticaProject/nx-libs/pull/766
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 246d39355..6ce2e48e8 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) == False) + if (!nxagentOption(SharedMemory)) { 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 = 0; + nxagentShmTrap = False; nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data); - nxagentShmTrap = 1; + nxagentShmTrap = True; return; } @@ -476,11 +476,11 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr) { PixmapPtr result; - nxagentShmPixmapTrap = 1; + nxagentShmPixmapTrap = True; result = nxagent_fbShmCreatePixmap(pScreen, width, height, depth, addr); - nxagentShmPixmapTrap = 0; + nxagentShmPixmapTrap = False; return result; } @@ -553,11 +553,11 @@ ProcShmDispatch (register ClientPtr client) { int result; - nxagentShmTrap = 1; + nxagentShmTrap = True; result = nxagent_ProcShmDispatch(client); - nxagentShmTrap = 0; + nxagentShmTrap = False; return result; } @@ -591,13 +591,13 @@ SProcShmDispatch (client) #endif #ifdef NXAGENT_SERVER - nxagentShmTrap = 1; + nxagentShmTrap = True; #endif result = SProcShmPutImage(client); #ifdef NXAGENT_SERVER - nxagentShmTrap = 0; + nxagentShmTrap = False; #endif #ifdef TEST |