xserver: Branch 'master'

[GitLab Mirror]

 hw/xnest/Xnest.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit eafd687c47e57df90c1c1c5f7e855c3ff96c6347
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Jul 30 15:39:19 2024 +0200

    Xnest: add guards to Xnest.h
    
    protect it from duplicate inclusion.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1658>

diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index 37ea6e532..fafb2c876 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -27,6 +27,8 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
+#ifndef _XORG_XNEST_H
+#define _XORG_XNEST_H
 
 /*
 ** Machines with a 64 bit library interface and a 32 bit server require
@@ -88,3 +90,5 @@ typedef XID KeySym64;
 #undef GContext
 #undef KeySym
 #endif /*_XSERVER64_tmp*/
+
+#endif /* _XORG_XNEST_H */