[PATCH:libX11] unifdef XKB_IN_SERVER

[Peter Hutterer]

On Fri, Mar 01, 2013 at 11:41:07PM -0800, Alan Coopersmith wrote:
> Leftovers from XKB files that were previously shared between the client
> and server code, but aren't any more.
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> ---
>  src/xkb/XKBAlloc.c  |   12 ------------
>  src/xkb/XKBGAlloc.c |   12 ------------
>  src/xkb/XKBMAlloc.c |   13 -------------
>  src/xkb/XKBMisc.c   |   13 -------------
>  4 files changed, 50 deletions(-)
> 
> diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
> index 05e9f73..034539b 100644
> --- a/src/xkb/XKBAlloc.c
> +++ b/src/xkb/XKBAlloc.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"
> @@ -39,17 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  #include <X11/extensions/XKBproto.h>
>  #include "XKBlibint.h"
>  
> -#else
> -
> -#include <stdio.h>
> -#include <X11/X.h>
> -#include <X11/Xproto.h>
> -#include "misc.h"
> -#include "inputstr.h"
> -#include <X11/extensions/XKBsrv.h>
> -#include <X11/extensions/XKBgeom.h>
> -
> -#endif /* XKB_IN_SERVER */
>  
>  /***===================================================================***/
>  
> diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
> index 7679496..e55f5e8 100644
> --- a/src/xkb/XKBGAlloc.c
> +++ b/src/xkb/XKBGAlloc.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,17 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  #include <X11/extensions/XKBgeom.h>
>  #include <X11/extensions/XKBproto.h>
>  
> -#else
> -
> -#include <stdio.h>
> -#include <X11/X.h>
> -#include <X11/Xproto.h>
> -#include "misc.h"
> -#include "inputstr.h"
> -#include <X11/extensions/XKBsrv.h>
> -#include <X11/extensions/XKBgeom.h>
> -
> -#endif /* XKB_IN_SERVER */
>  
>  #ifdef X_NOT_POSIX
>  #define Size_t unsigned int
> diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
> index a6b3921..fd75f0c 100644
> --- a/src/xkb/XKBMAlloc.c
> +++ b/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 */
>  
>  /***====================================================================***/
>  
> diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
> index 4aa1f73..cd90da7 100644
> --- a/src/xkb/XKBMisc.c
> +++ b/src/xkb/XKBMisc.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 */
>  
>  /***====================================================================***/
>  
> -- 
> 1.7.9.2