diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
| commit | 2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (patch) | |
| tree | bdbda91d988ad3e7d19d4184c2d2930be9d3d26f /include/X11/extensions/XKBrules.h | |
| parent | 452889aad6eca008ccba92e98eb8139dccea94d8 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'include/X11/extensions/XKBrules.h')
| -rw-r--r-- | include/X11/extensions/XKBrules.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h index 61f1551..5ded708 100644 --- a/include/X11/extensions/XKBrules.h +++ b/include/X11/extensions/XKBrules.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */ /***====================================================================***/ @@ -106,96 +106,72 @@ typedef struct _XkbRF_Rules { _XFUNCPROTOBEGIN extern Bool XkbRF_GetComponents( -#if NeedFunctionPrototypes XkbRF_RulesPtr /* rules */, XkbRF_VarDefsPtr /* var_defs */, XkbComponentNamesPtr /* names */ -#endif ); extern XkbRF_RulePtr XkbRF_AddRule( -#if NeedFunctionPrototypes XkbRF_RulesPtr /* rules */ -#endif ); extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); extern Bool XkbRF_LoadRules( -#if NeedFunctionPrototypes FILE * /* file */, XkbRF_RulesPtr /* rules */ -#endif ); extern Bool XkbRF_LoadRulesByName( -#if NeedFunctionPrototypes char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ -#endif ); /***====================================================================***/ extern XkbRF_VarDescPtr XkbRF_AddVarDesc( -#if NeedFunctionPrototypes XkbRF_DescribeVarsPtr /* vars */ -#endif ); extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy( -#if NeedFunctionPrototypes XkbRF_DescribeVarsPtr /* vars */, XkbRF_VarDescPtr /* copy_from */ -#endif ); extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( -#if NeedFunctionPrototypes XkbRF_RulesPtr /* rules */, char * /* name */ -#endif ); extern Bool XkbRF_LoadDescriptions( -#if NeedFunctionPrototypes FILE * /* file */, XkbRF_RulesPtr /* rules */ -#endif ); extern Bool XkbRF_LoadDescriptionsByName( -#if NeedFunctionPrototypes char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ -#endif ); extern XkbRF_RulesPtr XkbRF_Load( -#if NeedFunctionPrototypes char * /* base */, char * /* locale */, Bool /* wantDesc */, Bool /* wantRules */ -#endif ); extern XkbRF_RulesPtr XkbRF_Create( -#if NeedFunctionPrototypes int /* sz_rules */, int /* sz_extra */ -#endif ); /***====================================================================***/ extern void XkbRF_Free( -#if NeedFunctionPrototypes XkbRF_RulesPtr /* rules */, Bool /* freeRules */ -#endif ); @@ -207,19 +183,15 @@ extern void XkbRF_Free( #ifndef XKB_IN_SERVER extern Bool XkbRF_GetNamesProp( -#if NeedFunctionPrototypes Display * /* dpy */, char ** /* rules_file_rtrn */, XkbRF_VarDefsPtr /* var_defs_rtrn */ -#endif ); extern Bool XkbRF_SetNamesProp( -#if NeedFunctionPrototypes Display * /* dpy */, char * /* rules_file */, XkbRF_VarDefsPtr /* var_defs */ -#endif ); #endif |