xserver: Branch 'master' - 2 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Apr 15 19:23:41 UTC 2024 

 hw/xnest/Args.c     |    2 ++
 hw/xnest/Args.h     |    3 +++
 hw/xnest/Color.c    |    2 ++
 hw/xnest/Color.h    |    3 +++
 hw/xnest/Cursor.c   |    2 ++
 hw/xnest/Events.c   |    2 ++
 hw/xnest/Font.c     |    6 ++++--
 hw/xnest/GC.c       |    2 ++
 hw/xnest/GCOps.c    |    4 +++-
 hw/xnest/Init.c     |    3 ++-
 hw/xnest/Init.h     |    2 ++
 hw/xnest/Keyboard.c |    2 ++
 hw/xnest/Pixmap.c   |    2 ++
 hw/xnest/Screen.c   |    2 ++
 hw/xnest/Screen.h   |    3 +++
 hw/xnest/Visual.h   |    2 ++
 hw/xnest/Window.c   |    2 ++
 hw/xnest/XNCursor.h |    2 ++
 hw/xnest/XNFont.h   |    2 ++
 hw/xnest/XNGC.h     |    2 ++
 hw/xnest/XNPixmap.h |    2 ++
 hw/xnest/XNWindow.h |    2 ++
 22 files changed, 50 insertions(+), 4 deletions(-)

New commits:
commit 2cc5c572383239ce0bef1e0b8c4f8e8f024aae70
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 15 19:56:08 2024 +0100

    Xnest: cleanup X.h includes
    
    It's cleaner to include explicitly instead of relying on indirect includes,
    thus adding a few more on X.h.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1394>

diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h
index cce503cb2..2ae2984b4 100644
--- a/hw/xnest/Args.h
+++ b/hw/xnest/Args.h
@@ -15,6 +15,7 @@ is" without express or implied warranty.
 #ifndef XNESTARGS_H
 #define XNESTARGS_H
 
+#include <X11/X.h>
 #include <X11/Xdefs.h>
 
 extern char *xnestDisplayName;
diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h
index 480b35cbb..23f17540d 100644
--- a/hw/xnest/Color.h
+++ b/hw/xnest/Color.h
@@ -15,6 +15,7 @@ is" without express or implied warranty.
 #ifndef XNESTCOLOR_H
 #define XNESTCOLOR_H
 
+#include <X11/X.h>
 #include <X11/Xdefs.h>
 
 #define DUMB_WINDOW_MANAGERS
diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h
index 4ab73c41b..d06338f5a 100644
--- a/hw/xnest/Screen.h
+++ b/hw/xnest/Screen.h
@@ -15,6 +15,7 @@ is" without express or implied warranty.
 #ifndef XNESTSCREEN_H
 #define XNESTSCREEN_H
 
+#include <X11/X.h>
 #include <X11/Xdefs.h>
 
 extern Window xnestDefaultWindows[MAXSCREENS];
diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h
index c3ae8a19f..12f19d9ab 100644
--- a/hw/xnest/Visual.h
+++ b/hw/xnest/Visual.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTVISUAL_H
 #define XNESTVISUAL_H
 
+#include <X11/X.h>
+
 Visual *xnestVisual(VisualPtr pVisual);
 Visual *xnestVisualFromID(ScreenPtr pScreen, VisualID visual);
 Colormap xnestDefaultVisualColormap(Visual * visual);
commit 737c316a990ae34e91222bcef21bac819b420b1c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 15 19:39:49 2024 +0100

    Xnest: canonicalize includes: <X11/Xdefs.h>
    
    For cleaner code, make sure every source needing something from Xdefs.h
    does explicitly include it (not relying on indirect including)
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1394>

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index f54dbd608..76544eb2d 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h
index 225418d22..cce503cb2 100644
--- a/hw/xnest/Args.h
+++ b/hw/xnest/Args.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTARGS_H
 #define XNESTARGS_H
 
+#include <X11/Xdefs.h>
+
 extern char *xnestDisplayName;
 extern Bool xnestSynchronize;
 extern Bool xnestFullGeneration;
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index 3a9e42203..7a1d9333a 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "window.h"
 #include "windowstr.h"
diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h
index 2c4e0be2a..480b35cbb 100644
--- a/hw/xnest/Color.h
+++ b/hw/xnest/Color.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTCOLOR_H
 #define XNESTCOLOR_H
 
+#include <X11/Xdefs.h>
+
 #define DUMB_WINDOW_MANAGERS
 
 #define MAXCMAPS 1
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index d8486e664..fea5a959b 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 517ff7998..5474f88ab 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 192b80f53..4a8f7d328 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -18,11 +18,13 @@ is" without express or implied warranty.
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "regionstr.h"
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
+
+#include "misc.h"
+#include "regionstr.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index ecfa61e39..df12aee7d 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index e1cf9d65f..9c35d7410 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -17,9 +17,11 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
-#include "regionstr.h"
 #include <X11/fonts/fontstruct.h>
+
+#include "regionstr.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 1f18e335b..8bf779621 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
 
 #include "dix/screenint_priv.h"
 
@@ -28,7 +30,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 #include "mi.h"
-#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 
 #include "Xnest.h"
diff --git a/hw/xnest/Init.h b/hw/xnest/Init.h
index 7c0291ebf..0dc143904 100644
--- a/hw/xnest/Init.h
+++ b/hw/xnest/Init.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTINIT_H
 #define XNESTINIT_H
 
+#include <X11/Xdefs.h>
+
 extern Bool xnestDoFullGeneration;
 
 #endif                          /* XNESTINIT_H */
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 46f257c83..7735b9310 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -21,8 +21,10 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+
 #include "screenint.h"
 #include "inputstr.h"
 #include "misc.h"
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 6514f3b31..804e8a3a3 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 5769dd1c2..14763e0e7 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h
index 17c514af7..4ab73c41b 100644
--- a/hw/xnest/Screen.h
+++ b/hw/xnest/Screen.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTSCREEN_H
 #define XNESTSCREEN_H
 
+#include <X11/Xdefs.h>
+
 extern Window xnestDefaultWindows[MAXSCREENS];
 extern Window xnestScreenSaverWindows[MAXSCREENS];
 
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index d6f44a25a..7b410c4a3 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "gcstruct.h"
 #include "window.h"
 #include "windowstr.h"
diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h
index 24f885bf0..727f20989 100644
--- a/hw/xnest/XNCursor.h
+++ b/hw/xnest/XNCursor.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTCURSOR_H
 #define XNESTCURSOR_H
 
+#include <X11/Xdefs.h>
+
 #include "mipointrst.h"
 
 typedef struct {
diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h
index a210b1790..1c10da1ea 100644
--- a/hw/xnest/XNFont.h
+++ b/hw/xnest/XNFont.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTFONT_H
 #define XNESTFONT_H
 
+#include <X11/Xdefs.h>
+
 typedef struct {
     XFontStruct *font_struct;
 } xnestPrivFont;
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index 974173e50..6a222d073 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTGC_H
 #define XNESTGC_H
 
+#include <X11/Xdefs.h>
+
 /* This file uses the GC definition form Xlib.h as XlibGC. */
 
 typedef struct {
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h
index b7b10e907..0bd8214a5 100644
--- a/hw/xnest/XNPixmap.h
+++ b/hw/xnest/XNPixmap.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTPIXMAP_H
 #define XNESTPIXMAP_H
 
+#include <X11/Xdefs.h>
+
 extern DevPrivateKeyRec xnestPixmapPrivateKeyRec;
 
 #define xnestPixmapPrivateKey (&xnestPixmapPrivateKeyRec)
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index 6320ede5e..59dba01c0 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTWINDOW_H
 #define XNESTWINDOW_H
 
+#include <X11/Xdefs.h>
+
 typedef struct {
     Window window;
     Window parent;

More information about the xorg-commit mailing list