xserver: Branch 'master' - 4 commits

[GitLab Mirror]

 Xext/dpms.c             |    1 +
 Xext/geext.c            |    2 ++
 Xi/xichangehierarchy.c  |    1 -
 dix/dix_priv.h          |    1 -
 dix/events.c            |    1 -
 include/dix.h           |    1 -
 include/inputstr.h      |    1 -
 include/misc.h          |    1 -
 present/present_event.c |    2 ++
 9 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 1fc9a26afd5f512181e80d51bc8454d415e82c47
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 18 15:09:00 2025 +0100

    drop not needed includes of geext.h
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1810>

diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index bc0a4c4db..c1b25a40f 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -48,7 +48,6 @@
 #include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
 #include "exglobals.h"
-#include "geext.h"
 #include "misc.h"
 #include "xace.h"
 #include "xiquerydevice.h"      /* for GetDeviceUse */
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 208e5b618..47c18817f 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -24,7 +24,6 @@
 #include "include/gc.h"
 #include "include/input.h"
 #include "include/window.h"
-#include "Xext/geext.h"
 
 /* server setting: maximum size for big requests */
 #define MAX_BIG_REQUEST_SIZE 4194303
diff --git a/dix/events.c b/dix/events.c
index f4cd7bb62..420375668 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -148,7 +148,6 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "dixevents.h"
 #include "dispatch.h"
-#include "geext.h"
 #include "dixstruct_priv.h"
 #include "eventstr.h"
 #include "enterleave.h"
diff --git a/include/dix.h b/include/dix.h
index 49d50e603..e40a3e64c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -52,7 +52,6 @@ SOFTWARE.
 #include "window.h"
 #include "input.h"
 #include "cursor.h"
-#include "geext.h"
 #include "events.h"
 #include <X11/extensions/XI.h>
 
diff --git a/include/inputstr.h b/include/inputstr.h
index 034697104..3022944c1 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -54,7 +54,6 @@ SOFTWARE.
 #include "window.h"
 #include "dixstruct.h"
 #include "cursorstr.h"
-#include "geext.h"
 #include "privates.h"
 
 extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
commit a955b838484c1266c607fe598bd891fb0b6c8d5d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 18 15:26:54 2025 +0100

    Xext: dpms: need to include geext.h
    
    It's calling GERegisterExtension(), which is defined in geext.h
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1810>

diff --git a/Xext/dpms.c b/Xext/dpms.c
index af1869cb2..597f5cf4d 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -32,6 +32,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 
 #include "os/screensaver.h"
+#include "Xext/geext.h"
 
 #include "misc.h"
 #include "os.h"
commit ce1f0c9375ae666a750776bd66d2b47dae6b13c2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 18 15:06:52 2025 +0100

    present: need to include geext.h
    
    It's calling GERegisterExtension(), which is defined in geext.h
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1810>

diff --git a/present/present_event.c b/present/present_event.c
index adc8a484e..0c1855ec4 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -21,6 +21,8 @@
  */
 #include <dix-config.h>
 
+#include "Xext/geext.h"
+
 #include "present_priv.h"
 
 static RESTYPE present_event_type;
commit 80593ab2797f356ca43179ee8312f4e81b61ee81
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 24 11:50:39 2025 +0100

    misc.h: move out MAXEXTENSIONS to geext.c
    
    The only user of it is geext.c, so no need to have that define
    in a public include file.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1810>

diff --git a/Xext/geext.c b/Xext/geext.c
index d2a32f999..30e4dd317 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -31,6 +31,8 @@
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
+#define MAXEXTENSIONS   128
+
 Bool noGEExtension = FALSE;
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
diff --git a/include/misc.h b/include/misc.h
index 36554fa3c..90d7046d3 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -89,7 +89,6 @@ OF THIS SOFTWARE.
 #endif
 #define MAXCLIENTS	2048
 #define LIMITCLIENTS	256     /* Must be a power of 2 and <= MAXCLIENTS */
-#define MAXEXTENSIONS   128
 #define MAXFORMATS	8
 #ifndef MAXDEVICES
 #define MAXDEVICES	256      /* input devices */