xserver: Branch 'master'

[GitLab Mirror]

 include/xkbstr.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 992aba3cb782185b9482d350c6d1c791a2d10010
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Apr 5 14:52:45 2024 +0200

    include: xkbstr.h: fix missing include of Xdefs.h
    
    xkbstr.h uses types from Xdefs.h (eg. Bool) but doesn't include it.
    If somebody includes it, w/o including Xdefs.h first, compile breaks:
    
    ../include/xkbstr.h:84:5: error: unknown type name ‘Bool’
       84 |     Bool active;
          |     ^~~~
    ../include/xkbstr.h:517:5: error: unknown type name ‘Bool’
      517 |     Bool num_groups_changed;
          |     ^~~~
    ../include/xkbstr.h:608:5: error: unknown type name ‘Bool’
      608 |     Bool has_own_state;
          |     ^~~~
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1474>

diff --git a/include/xkbstr.h b/include/xkbstr.h
index 8a9f01c68..749f1f26e 100644
--- a/include/xkbstr.h
+++ b/include/xkbstr.h
@@ -27,6 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBSTR_H_
 #define	_XKBSTR_H_
 
+#include <X11/Xdefs.h>
 #include <X11/extensions/XKB.h>
 
 #define	XkbCharToInt(v) ((int) ((v) & 0x80 ? ((v) | (~0xff)) : ((v) & 0x7f)))