xserver: Branch 'master'

[GitLab Mirror]

 Xext/geext.c   |    2 --
 include/misc.h |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 55ad737a9fcd574aa94124a100af41feb695994b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Jun 11 14:33:39 2025 -0700

    Revert "misc.h: move out MAXEXTENSIONS to geext.c"
    
    This reverts commit 80593ab2797f356ca43179ee8312f4e81b61ee81.
    
    This is a fundamental property of the X11 core protocol,
    there is no benefit to hiding it, it can't change.
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2013>

diff --git a/Xext/geext.c b/Xext/geext.c
index 96352ee0b..3766ffdb3 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -31,8 +31,6 @@
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
-#define MAXEXTENSIONS   128
-
 DevPrivateKeyRec GEClientPrivateKeyRec;
 
 #define GEClientPrivateKey (&GEClientPrivateKeyRec)
diff --git a/include/misc.h b/include/misc.h
index 90d7046d3..36554fa3c 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -89,6 +89,7 @@ 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 */