[X2Go-Commits] [nx-libs] 308/429: Trap.h: fix type of traps

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 9f1d0a807fd4da80e366d439b945e924bd2cfe95
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Mar 30 00:20:26 2021 +0200

    Trap.h: fix type of traps
    
    They are Booleans for some time now but this change was missing in Trap.h
---
 nx-X11/programs/Xserver/hw/nxagent/Trap.h | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.h b/nx-X11/programs/Xserver/hw/nxagent/Trap.h
index 4203d2b13..1c10f00ea 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Trap.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.h
@@ -26,6 +26,8 @@
 #ifndef __Traps_H__
 #define __Traps_H__
 
+#include <nx-X11/Xdefs.h>
+
 #ifndef False
 #define False 0
 #endif
@@ -38,72 +40,72 @@
  * Set if we are dispatching a render extension request. Used to avoid
  * reentrancy in GC operations.
  */
-extern int nxagentGCTrap;
+extern Bool nxagentGCTrap;
 
 /*
  * Set if we are enqueing an internal operation, CreateWindow and
  * Reparent- Window. Used to remove any screen operation.
  */
-extern int nxagentScreenTrap;
+extern Bool nxagentScreenTrap;
 
 /*
  * Set if we are executing a GC operation only on the X side. Used to
  * avoid reentrancy in FB layer.
  */
-extern int nxagentFBTrap;
+extern Bool nxagentFBTrap;
 
 /*
  * Set if we are dispatching a shared memory extension request.
  */
-extern int nxagentShmTrap;
+extern Bool nxagentShmTrap;
 
 /*
  * Set if a shared pixmap operation is requested by the client.
  */
-extern int nxagentShmPixmapTrap;
+extern Bool nxagentShmPixmapTrap;
 
 /*
  * Set if we are dispatching a XVideo extension request.
  */
-extern int nxagentXvTrap;
+extern Bool nxagentXvTrap;
 
 /*
  * Set if we are dispatching a GLX extension request.
  */
-extern int nxagentGlxTrap;
+extern Bool nxagentGlxTrap;
 
 /*
  * Set while we are resuming the session.
  */
-extern int nxagentReconnectTrap;
+extern Bool nxagentReconnectTrap;
 
 /*
  * Set if we need to realize a drawable by using a lossless encoding.
  */
-extern int nxagentLosslessTrap;
+extern Bool nxagentLosslessTrap;
 
 /*
  * Set to force the synchronization of a drawable.
  */
-extern int nxagentSplitTrap;
+extern Bool nxagentSplitTrap;
 
 /*
  * Set to avoid CapsLock synchronization problems when CapsLock is the
  * first key to be pressed in the session.
  */
-extern int nxagentXkbCapsTrap;
+extern Bool nxagentXkbCapsTrap;
 
 /*
  * Set to avoid NumLock synchronization problems when NumLock is the
  * first key to be pressed in the session.
  */
-extern int nxagentXkbNumTrap;
+extern Bool nxagentXkbNumTrap;
 
 /*
  * Set to indicate we are processing a clipboard event triggered by
  * the real X server. This is used to avoid endless loops if callbacks
  * would trigger another event by the real X server
  */
-extern int nxagentExternalClipboardEventTrap;
+extern Bool nxagentExternalClipboardEventTrap;
 
 #endif /* __Trap_H__ */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git