From 7544a9eb35d5850ae2e68d8cdab50f25ce7cd5d9 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 20 Oct 2013 01:01:37 -0700 Subject: unifdef -UXKB_IN_SERVER Xserver has its own copy of this code now, so we don't need to keep an unused copy in libxkbfile too. Signed-off-by: Alan Coopersmith Reviewed-by: Ran Benita --- include/X11/extensions/XKBfile.h | 2 -- include/X11/extensions/XKBrules.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'include') diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h index 0d2f52b..a59b16a 100644 --- a/include/X11/extensions/XKBfile.h +++ b/include/X11/extensions/XKBfile.h @@ -233,14 +233,12 @@ extern Bool XkbLookupGroupAndLevel( /***====================================================================***/ -#ifndef XKB_IN_SERVER extern Bool XkbLookupCanonicalRGBColor( char * /* def */, XColor * /* color */ ); -#endif /***====================================================================***/ diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h index 2832e67..4736056 100644 --- a/include/X11/extensions/XKBrules.h +++ b/include/X11/extensions/XKBrules.h @@ -178,7 +178,6 @@ extern void XkbRF_Free( #define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES" #define _XKB_RF_NAMES_PROP_MAXLEN 1024 -#ifndef XKB_IN_SERVER extern Bool XkbRF_GetNamesProp( Display * /* dpy */, @@ -192,7 +191,6 @@ extern Bool XkbRF_SetNamesProp( XkbRF_VarDefsPtr /* var_defs */ ); -#endif _XFUNCPROTOEND -- cgit v1.2.3