diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-10-20 01:01:37 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-10-28 20:28:56 -0700 |
| commit | 7544a9eb35d5850ae2e68d8cdab50f25ce7cd5d9 (patch) | |
| tree | cbd9d1920342feb8bfa6ca2f8b19c40c8b87f140 /include/X11 | |
| parent | a945540e6eea9b9303c8f611412ecb58129180e7 (diff) | |
| download | xorg-lib-libxkbfile-7544a9eb35d5850ae2e68d8cdab50f25ce7cd5d9.tar.gz | |
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 <alan.coopersmith@oracle.com>
Reviewed-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'include/X11')
| -rw-r--r-- | include/X11/extensions/XKBfile.h | 2 | ||||
| -rw-r--r-- | include/X11/extensions/XKBrules.h | 2 |
2 files changed, 0 insertions, 4 deletions
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 |