xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/xkb/xkbPrivate.c |    1 -
 test/test_xkb.c             |    1 -
 xkb/XKBMAlloc.c             |    1 -
 xkb/XKBMisc.c               |    1 -
 xkb/ddxLoad.c               |    1 -
 xkb/maprules.c              |    1 -
 xkb/xkb.c                   |    1 -
 xkb/xkbInit.c               |    1 -
 xkb/xkbUtils.c              |    2 --
 xkb/xkbfmisc.c              |    1 -
 xkb/xkbout.c                |    1 -
 xkb/xkbtext.c               |    1 -
 12 files changed, 13 deletions(-)

New commits:
commit 374ee7acd7caa2639cb124b1fb915307b8a19513
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 13 19:59:55 2024 +0100

    xkb: drop defining XKBSRV_NEED_FILE_FUNCS
    
    No need to define XKBSRV_NEED_FILE_FUNCS, for about 15 years now
    (since XKBsrv.h isn't used anymore), so drop it.
    
    Fixes: e5f002eddef1abe324033a3155f01d048536a48d
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>

diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c
index 009610892..506b60bb0 100644
--- a/hw/xfree86/xkb/xkbPrivate.c
+++ b/hw/xfree86/xkb/xkbPrivate.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <X11/X.h>
 #include "windowstr.h"
-#define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 #include "dixgrabs.h"
diff --git a/test/test_xkb.c b/test/test_xkb.c
index b92e5d555..303bbec53 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -43,7 +43,6 @@
 #include "inputstr.h"
 #include "opaque.h"
 #include "property.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "../xkb/xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 3e380a8ea..fa4c86d44 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <X11/keysym.h>
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 /***====================================================================***/
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 2bad695e0..0a3b5cbc7 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <X11/keysym.h>
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 /***====================================================================***/
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 18814264a..3f9de20c1 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -41,7 +41,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
 
diff --git a/xkb/maprules.c b/xkb/maprules.c
index a096f2087..e071ab539 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -47,7 +47,6 @@
 #include "dix.h"
 #include "os.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 /***====================================================================***/
diff --git a/xkb/xkb.c b/xkb/xkb.c
index f9e3acbdc..b240b6f6c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -33,7 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "extnsionst.h"
 #include "extinit.h"
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index bc6ef4e56..189cd7c80 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -44,7 +44,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "opaque.h"
 #include "property.h"
 #include "scrnintstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index df2a584bd..3da816084 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -63,8 +63,6 @@ DEALINGS IN THE SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include "eventstr.h"
-
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index fc9197f2d..2f3ec5e4b 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -43,7 +43,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 5f77ab01d..46e07db3f 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -41,7 +41,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 
 #include "xkbgeom.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index fb17f513e..7f377fdfc 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -41,7 +41,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include "xkbgeom.h"