summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-28 22:28:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-12 11:43:32 +1000
commitcb95642dc8edebb2935dd471f8b339cb98aa8481 (patch)
tree30b96e2634f8cf52fad86bd853aa53d228e0193e /xkb
parent920b7622be4a68ebb5d8432f55c5362fbe964fce (diff)
Remove #define NEED_EVENTS and NEED_REPLIES
A grep on xorg/* revealed there's no consumer of this define. Quote Alan Coopersmith: "The consumer was in past versions of the headers now located in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h, all the event definitions were only available if NEED_EVENTS were defined, and all the reply definitions required NEED_REPLIES. Looks like Xproto.h dropped them by X11R6.3, which didn't have the #ifdef's anymore, so these are truly ancient now." Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'xkb')
-rw-r--r--xkb/XKBAlloc.c2
-rw-r--r--xkb/XKBGAlloc.c2
-rw-r--r--xkb/XKBMAlloc.c2
-rw-r--r--xkb/XKBMisc.c2
-rw-r--r--xkb/ddxBeep.c1
-rw-r--r--xkb/ddxCtrls.c1
-rw-r--r--xkb/ddxDevBtn.c1
-rw-r--r--xkb/ddxFakeMtn.c1
-rw-r--r--xkb/ddxInit.c1
-rw-r--r--xkb/ddxKeyClick.c1
-rw-r--r--xkb/ddxKillSrv.c1
-rw-r--r--xkb/ddxLEDs.c1
-rw-r--r--xkb/ddxList.c1
-rw-r--r--xkb/ddxLoad.c1
-rw-r--r--xkb/ddxPrivate.c1
-rw-r--r--xkb/ddxVT.c1
-rw-r--r--xkb/maprules.c1
-rw-r--r--xkb/xkb.c2
-rw-r--r--xkb/xkbAccessX.c1
-rw-r--r--xkb/xkbActions.c1
-rw-r--r--xkb/xkbEvents.c1
-rw-r--r--xkb/xkbInit.c1
-rw-r--r--xkb/xkbLEDs.c1
-rw-r--r--xkb/xkbPrKeyEv.c1
-rw-r--r--xkb/xkbPrOtherEv.c1
-rw-r--r--xkb/xkbSwap.c2
-rw-r--r--xkb/xkbUtils.c1
-rw-r--r--xkb/xkbfmisc.c1
-rw-r--r--xkb/xkbout.c1
-rw-r--r--xkb/xkbtext.c1
-rw-r--r--xkb/xkmread.c1
31 files changed, 0 insertions, 37 deletions
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 8f468a0f3..559a52483 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -30,8 +30,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/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index c37f49a55..9561a3df8 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 178b5b89a..de8ee29fa 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -32,8 +32,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/xkb/XKBMisc.c b/xkb/XKBMisc.c
index a9d8b17c0..39bbec651 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -32,8 +32,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/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 74d868c0e..10a731724 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index be269c2af..04de608df 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 585ad198e..709efc13a 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 3f010f9ce..f90d2099a 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index 4c78a621b..89ffb789f 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index 51d78f56d..aabedab98 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 3b5fd5353..106b39587 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index b4c8086f5..246d58c31 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index ae3a7f7e0..da2f9a8bf 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xos.h>
#include <X11/Xproto.h>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4d5dfb685..b4ac53593 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xos.h>
#include <X11/Xproto.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index f67e20c27..f1c85f6ea 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -3,7 +3,6 @@
#include <dix-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include "windowstr.h"
#include <xkbsrv.h>
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 55c82a865..cbd453706 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/maprules.c b/xkb/maprules.c
index bd242ea05..b56055f5d 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -36,7 +36,6 @@
#define XOS_USE_NO_LOCKING
#include <X11/Xos_r.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/X.h>
#include <X11/Xos.h>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 24cf91598..f6dfb0800 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -30,8 +30,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/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 0cc3b80b3..f9b4b850f 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 64e17e9ac..6696c7649 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 51880f85f..96e527baa 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 82ec18c85..5f51c45f5 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <ctype.h>
#include <unistd.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index e7539254b..68ab5ff4c 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -31,7 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index a3f715c7d..6feb9be6a 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index 8017903be..ef8b014ff 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 1a513b35c..ffd66b563 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -30,8 +30,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/xkb/xkbUtils.c b/xkb/xkbUtils.c
index ca80ff48d..6b5acd8c2 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -56,7 +56,6 @@ DEALINGS IN THE SOFTWARE.
#include <stdio.h>
#include <ctype.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#define XK_CYRILLIC
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index ae752e945..dd403eaff 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -36,7 +36,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 229cc9258..8913d8ed2 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -34,7 +34,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index d08c91589..f9bfae581 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -35,7 +35,6 @@
#include <X11/Xos.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b14a5beda..1b6149b8b 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -34,7 +34,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"