xserver: Branch 'master'

[Keith Packard]

 include/X11/extensions/saverproto.h |    2 +-
 scrnsaverproto.pc.in                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 702d2eaecd00e2a943e883b8f683ec9fb79a0652
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Mar 12 11:57:12 2018 -0700

    screensaver: Fix encoding of ScreenSaverSuspend 'suspend' element
    
    Was using Bool, which is not a defined X protocol encoding type and
    has presumably been a 32-bit type. Switch to a CARD32 to be compatible
    while at least being well defined.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Mihai Moldovan <ionic at ionic.de>

diff --git a/include/X11/extensions/saverproto.h b/include/X11/extensions/saverproto.h
index 7197084..b3e5653 100644
--- a/include/X11/extensions/saverproto.h
+++ b/include/X11/extensions/saverproto.h
@@ -139,7 +139,7 @@ typedef struct _ScreenSaverSuspend {
     CARD8 reqType;
     CARD8 saverReqType;
     CARD16 length B16;
-    Bool suspend B32;
+    CARD32 suspend B32;		/* a boolean, but using the wrong encoding */
 } xScreenSaverSuspendReq;
 #define sz_xScreenSaverSuspendReq	8
 
diff --git a/scrnsaverproto.pc.in b/scrnsaverproto.pc.in
index 6556a2c..c58a47a 100644
--- a/scrnsaverproto.pc.in
+++ b/scrnsaverproto.pc.in
@@ -5,5 +5,5 @@ includedir=@includedir@
  
 Name: ScrnSaverProto
 Description: ScrnSaver extension headers
-Version: 1.2.2
+Version: 1.2.3
 Cflags: -I${includedir}