summaryrefslogtreecommitdiff
path: root/lib/libX11/src/xkb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libX11/src/xkb')
-rw-r--r--lib/libX11/src/xkb/Makefile.am1
-rw-r--r--lib/libX11/src/xkb/Makefile.in49
-rw-r--r--lib/libX11/src/xkb/XKB.c4
-rw-r--r--lib/libX11/src/xkb/XKBAlloc.c4
-rw-r--r--lib/libX11/src/xkb/XKBBell.c2
-rw-r--r--lib/libX11/src/xkb/XKBBind.c1
-rw-r--r--lib/libX11/src/xkb/XKBCompat.c2
-rw-r--r--lib/libX11/src/xkb/XKBCtrls.c2
-rw-r--r--lib/libX11/src/xkb/XKBCvt.c1
-rw-r--r--lib/libX11/src/xkb/XKBExtDev.c2
-rw-r--r--lib/libX11/src/xkb/XKBGAlloc.c7
-rw-r--r--lib/libX11/src/xkb/XKBGeom.c2
-rw-r--r--lib/libX11/src/xkb/XKBGetByName.c2
-rw-r--r--lib/libX11/src/xkb/XKBGetMap.c3
-rw-r--r--lib/libX11/src/xkb/XKBList.c4
-rw-r--r--lib/libX11/src/xkb/XKBMAlloc.c4
-rw-r--r--lib/libX11/src/xkb/XKBMisc.c6
-rw-r--r--lib/libX11/src/xkb/XKBNames.c2
-rw-r--r--lib/libX11/src/xkb/XKBRdBuf.c2
-rw-r--r--lib/libX11/src/xkb/XKBSetGeom.c2
-rw-r--r--lib/libX11/src/xkb/XKBSetMap.c2
-rw-r--r--lib/libX11/src/xkb/XKBUse.c2
-rw-r--r--lib/libX11/src/xkb/XKBleds.c2
23 files changed, 26 insertions, 82 deletions
diff --git a/lib/libX11/src/xkb/Makefile.am b/lib/libX11/src/xkb/Makefile.am
index f69694ec6..cde2afbf9 100644
--- a/lib/libX11/src/xkb/Makefile.am
+++ b/lib/libX11/src/xkb/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/lib/libX11/src/xkb/Makefile.in b/lib/libX11/src/xkb/Makefile.in
index c7a97066c..37afd91ef 100644
--- a/lib/libX11/src/xkb/Makefile.in
+++ b/lib/libX11/src/xkb/Makefile.in
@@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@@ -40,7 +40,7 @@ subdir = src/xkb
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
- $(top_srcdir)/m4/dolt.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -60,6 +60,9 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -101,7 +104,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOLT_BASH = @DOLT_BASH@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
@@ -117,21 +119,18 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
GREP = @GREP@
-GROFF = @GROFF@
-GS_PATH = @GS_PATH@
-HAVE_GROFF_FALSE = @HAVE_GROFF_FALSE@
-HAVE_GROFF_HTML_FALSE = @HAVE_GROFF_HTML_FALSE@
-HAVE_GROFF_HTML_TRUE = @HAVE_GROFF_HTML_TRUE@
-HAVE_GROFF_MM_FALSE = @HAVE_GROFF_MM_FALSE@
-HAVE_GROFF_MM_TRUE = @HAVE_GROFF_MM_TRUE@
-HAVE_GROFF_MS_FALSE = @HAVE_GROFF_MS_FALSE@
-HAVE_GROFF_MS_TRUE = @HAVE_GROFF_MS_TRUE@
-HAVE_GROFF_TRUE = @HAVE_GROFF_TRUE@
+HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
+HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
-HAVE_PS2PDF_FALSE = @HAVE_PS2PDF_FALSE@
-HAVE_PS2PDF_TRUE = @HAVE_PS2PDF_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
+HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
+HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
@@ -153,8 +152,6 @@ LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LN_S = @LN_S@
-LTCOMPILE = @LTCOMPILE@
-LTCXXCOMPILE = @LTCXXCOMPILE@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -163,8 +160,6 @@ MAKEINFO = @MAKEINFO@
MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
-MANPAGES_FALSE = @MANPAGES_FALSE@
-MANPAGES_TRUE = @MANPAGES_TRUE@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -181,9 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
-PNMTOPNG_PATH = @PNMTOPNG_PATH@
-PS2PDF = @PS2PDF@
-PSSELECT_PATH = @PSSELECT_PATH@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -191,6 +183,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
THRSTUBS_FALSE = @THRSTUBS_FALSE@
THRSTUBS_TRUE = @THRSTUBS_TRUE@
UDC_FALSE = @UDC_FALSE@
@@ -205,12 +198,8 @@ X11_LIBS = @X11_LIBS@
X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
X11_LOCALEDIR = @X11_LOCALEDIR@
X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
-XCB_FALSE = @XCB_FALSE@
-XCB_TRUE = @XCB_TRUE@
XCMS_FALSE = @XCMS_FALSE@
XCMS_TRUE = @XCMS_TRUE@
-XDMCP_CFLAGS = @XDMCP_CFLAGS@
-XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKB_FALSE = @XKB_FALSE@
@@ -224,7 +213,10 @@ XLOCALELIBDIR = @XLOCALELIBDIR@
XLOCALE_FALSE = @XLOCALE_FALSE@
XLOCALE_TRUE = @XLOCALE_TRUE@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XMLTO = @XMLTO@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -288,7 +280,6 @@ AM_CPPFLAGS = \
AM_CFLAGS = \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/lib/libX11/src/xkb/XKB.c b/lib/libX11/src/xkb/XKB.c
index ad86b9161..f926cb997 100644
--- a/lib/libX11/src/xkb/XKB.c
+++ b/lib/libX11/src/xkb/XKB.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
@@ -464,7 +462,7 @@ XkbKTMapEntryPtr entry = NULL;
if (map_rtrn!=NULL) {
bzero(map_rtrn,type->mods.mask+1);
for (i=0;i<type->map_count;i++) {
- if (entry->active) {
+ if (entry && entry->active) {
map_rtrn[type->map[i].mods.mask]= type->map[i].level;
}
}
diff --git a/lib/libX11/src/xkb/XKBAlloc.c b/lib/libX11/src/xkb/XKBAlloc.c
index bd615eaae..05e9f7315 100644
--- a/lib/libX11/src/xkb/XKBAlloc.c
+++ b/lib/libX11/src/xkb/XKBAlloc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef XKB_IN_SERVER
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include "XKBlibint.h"
#include <X11/extensions/XKBgeom.h>
@@ -45,8 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/lib/libX11/src/xkb/XKBBell.c b/lib/libX11/src/xkb/XKBBell.c
index 0054a5c28..cf93ea79a 100644
--- a/lib/libX11/src/xkb/XKBBell.c
+++ b/lib/libX11/src/xkb/XKBBell.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
diff --git a/lib/libX11/src/xkb/XKBBind.c b/lib/libX11/src/xkb/XKBBind.c
index 49cfffe10..1c16adce2 100644
--- a/lib/libX11/src/xkb/XKBBind.c
+++ b/lib/libX11/src/xkb/XKBBind.c
@@ -28,7 +28,6 @@ from The Open Group.
/* the new monsters ate the old ones */
-#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/lib/libX11/src/xkb/XKBCompat.c b/lib/libX11/src/xkb/XKBCompat.c
index ba7f6864f..206b0c90f 100644
--- a/lib/libX11/src/xkb/XKBCompat.c
+++ b/lib/libX11/src/xkb/XKBCompat.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
diff --git a/lib/libX11/src/xkb/XKBCtrls.c b/lib/libX11/src/xkb/XKBCtrls.c
index 3742c94eb..2b33b3059 100644
--- a/lib/libX11/src/xkb/XKBCtrls.c
+++ b/lib/libX11/src/xkb/XKBCtrls.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
diff --git a/lib/libX11/src/xkb/XKBCvt.c b/lib/libX11/src/xkb/XKBCvt.c
index b2621a9b1..da74fc047 100644
--- a/lib/libX11/src/xkb/XKBCvt.c
+++ b/lib/libX11/src/xkb/XKBCvt.c
@@ -35,7 +35,6 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xlib.h>
-#define NEED_EVENTS
#include "Xlibint.h"
#include "Xlcint.h"
#include "XlcPubI.h"
diff --git a/lib/libX11/src/xkb/XKBExtDev.c b/lib/libX11/src/xkb/XKBExtDev.c
index e8157b95b..353e769bf 100644
--- a/lib/libX11/src/xkb/XKBExtDev.c
+++ b/lib/libX11/src/xkb/XKBExtDev.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
diff --git a/lib/libX11/src/xkb/XKBGAlloc.c b/lib/libX11/src/xkb/XKBGAlloc.c
index 8f163c340..90ec2f9cf 100644
--- a/lib/libX11/src/xkb/XKBGAlloc.c
+++ b/lib/libX11/src/xkb/XKBGAlloc.c
@@ -30,9 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
-
#ifndef XKB_IN_SERVER
#include <stdio.h>
@@ -699,11 +696,11 @@ register XkbPropertyPtr prop;
}
prop= &geom->properties[geom->num_properties];
prop->name= (char *)_XkbAlloc(strlen(name)+1);
- if (!name)
+ if (!prop->name)
return NULL;
strcpy(prop->name,name);
prop->value= (char *)_XkbAlloc(strlen(value)+1);
- if (!value) {
+ if (!prop->value) {
_XkbFree(prop->name);
prop->name= NULL;
return NULL;
diff --git a/lib/libX11/src/xkb/XKBGeom.c b/lib/libX11/src/xkb/XKBGeom.c
index 2742313e4..e9e36d0cb 100644
--- a/lib/libX11/src/xkb/XKBGeom.c
+++ b/lib/libX11/src/xkb/XKBGeom.c
@@ -31,8 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#define NEED_MAP_READERS
#include "Xlibint.h"
#include <X11/extensions/XKBgeom.h>
diff --git a/lib/libX11/src/xkb/XKBGetByName.c b/lib/libX11/src/xkb/XKBGetByName.c
index 15d0338a5..8e4f55458 100644
--- a/lib/libX11/src/xkb/XKBGetByName.c
+++ b/lib/libX11/src/xkb/XKBGetByName.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/lib/libX11/src/xkb/XKBGetMap.c b/lib/libX11/src/xkb/XKBGetMap.c
index c0d3c1724..30fb62971 100644
--- a/lib/libX11/src/xkb/XKBGetMap.c
+++ b/lib/libX11/src/xkb/XKBGetMap.c
@@ -24,9 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/lib/libX11/src/xkb/XKBList.c b/lib/libX11/src/xkb/XKBList.c
index f202d935d..8f245f245 100644
--- a/lib/libX11/src/xkb/XKBList.c
+++ b/lib/libX11/src/xkb/XKBList.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -81,6 +79,8 @@ char * str;
if (!this->name)
goto BAILOUT;
str= (char *)_XkbGetReadBufferPtr(buf,wlen);
+ if (!str)
+ goto BAILOUT;
memcpy(this->name,str,slen);
}
return first;
diff --git a/lib/libX11/src/xkb/XKBMAlloc.c b/lib/libX11/src/xkb/XKBMAlloc.c
index 3ed9c7bf2..a6b392168 100644
--- a/lib/libX11/src/xkb/XKBMAlloc.c
+++ b/lib/libX11/src/xkb/XKBMAlloc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef XKB_IN_SERVER
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include <X11/keysym.h>
@@ -44,8 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/lib/libX11/src/xkb/XKBMisc.c b/lib/libX11/src/xkb/XKBMisc.c
index 587d8f9a0..4aa1f733a 100644
--- a/lib/libX11/src/xkb/XKBMisc.c
+++ b/lib/libX11/src/xkb/XKBMisc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef XKB_IN_SERVER
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include <X11/keysym.h>
@@ -44,8 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
@@ -623,7 +619,7 @@ KeySym * syms;
XkbApplyCompatMapToKey(xkb,key,changes);
}
- if ((xkb->server->vmods!=NULL)&&(xkb->map->modmap!=NULL)&&(changes)&&
+ if ((xkb->map->modmap!=NULL)&&(changes)&&
(changes->map.changed&(XkbVirtualModMapMask|XkbModifierMapMask))) {
unsigned char newVMods[XkbNumVirtualMods];
register unsigned bit,i;
diff --git a/lib/libX11/src/xkb/XKBNames.c b/lib/libX11/src/xkb/XKBNames.c
index b07f73ca5..cf2382cca 100644
--- a/lib/libX11/src/xkb/XKBNames.c
+++ b/lib/libX11/src/xkb/XKBNames.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/lib/libX11/src/xkb/XKBRdBuf.c b/lib/libX11/src/xkb/XKBRdBuf.c
index 6d1f6724b..3023a32ed 100644
--- a/lib/libX11/src/xkb/XKBRdBuf.c
+++ b/lib/libX11/src/xkb/XKBRdBuf.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include "XKBlibint.h"
#include <X11/extensions/XKBproto.h>
diff --git a/lib/libX11/src/xkb/XKBSetGeom.c b/lib/libX11/src/xkb/XKBSetGeom.c
index aa6046c5b..ab76a2063 100644
--- a/lib/libX11/src/xkb/XKBSetGeom.c
+++ b/lib/libX11/src/xkb/XKBSetGeom.c
@@ -31,8 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include "Xlibint.h"
#include "XKBlibint.h"
#include <X11/extensions/XKBgeom.h>
diff --git a/lib/libX11/src/xkb/XKBSetMap.c b/lib/libX11/src/xkb/XKBSetMap.c
index bd46e1fc7..cad9364b7 100644
--- a/lib/libX11/src/xkb/XKBSetMap.c
+++ b/lib/libX11/src/xkb/XKBSetMap.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
diff --git a/lib/libX11/src/xkb/XKBUse.c b/lib/libX11/src/xkb/XKBUse.c
index 562e0f030..05dcfc182 100644
--- a/lib/libX11/src/xkb/XKBUse.c
+++ b/lib/libX11/src/xkb/XKBUse.c
@@ -29,8 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
#include <ctype.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "Xlibint.h"
#include <X11/extensions/XKBproto.h>
#include "XKBlibint.h"
diff --git a/lib/libX11/src/xkb/XKBleds.c b/lib/libX11/src/xkb/XKBleds.c
index 24a42c337..d9b743c6f 100644
--- a/lib/libX11/src/xkb/XKBleds.c
+++ b/lib/libX11/src/xkb/XKBleds.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#define NEED_MAP_READERS
#ifdef HAVE_CONFIG_H
#include <config.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-25 09:34:44 +0000