From d4d629b77742e60caac3d120ff40e9f386380af2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Mar 2013 08:18:40 +0100
Subject: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update
 4 Mar 2013

xserver          commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81
libX11           commit c23d61d1b84dca3740bf4786978c7908d0065fb9
pixman           commit 5feda20fc39407879993ed4a6d861ef7f78d9432
fontconfig       commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0
mesa             commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
---
 libX11/src/xkb/XKBMAlloc.c | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'libX11/src/xkb/XKBMAlloc.c')

diff --git a/libX11/src/xkb/XKBMAlloc.c b/libX11/src/xkb/XKBMAlloc.c
index a6b392168..fd75f0c8a 100644
--- a/libX11/src/xkb/XKBMAlloc.c
+++ b/libX11/src/xkb/XKBMAlloc.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 
-#ifndef XKB_IN_SERVER
 
 #include <stdio.h>
 #include "Xlibint.h"
@@ -38,18 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include "XKBlibint.h"
 
-#else
-
-#include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "inputstr.h"
-#include <X11/keysym.h>
-#define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-
-#endif /* XKB_IN_SERVER */
 
 /***====================================================================***/
 
-- 
cgit v1.2.3