diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
tree | eebaec908150abfc0159d9ee941404918f553113 /include/xkbrules.h | |
parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff) |
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
Diffstat (limited to 'include/xkbrules.h')
-rw-r--r-- | include/xkbrules.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/xkbrules.h b/include/xkbrules.h index 648e2e9c6..ff77ddc77 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -103,24 +103,24 @@ typedef struct _XkbRF_Rules { _XFUNCPROTOBEGIN -extern Bool XkbRF_GetComponents( +extern _X_EXPORT Bool XkbRF_GetComponents( XkbRF_RulesPtr /* rules */, XkbRF_VarDefsPtr /* var_defs */, XkbComponentNamesPtr /* names */ ); -extern XkbRF_RulePtr XkbRF_AddRule( +extern _X_EXPORT XkbRF_RulePtr XkbRF_AddRule( XkbRF_RulesPtr /* rules */ ); -extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); +extern _X_EXPORT XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); -extern Bool XkbRF_LoadRules( +extern _X_EXPORT Bool XkbRF_LoadRules( FILE * /* file */, XkbRF_RulesPtr /* rules */ ); -extern Bool XkbRF_LoadRulesByName( +extern _X_EXPORT Bool XkbRF_LoadRulesByName( char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ @@ -128,46 +128,46 @@ extern Bool XkbRF_LoadRulesByName( /***====================================================================***/ -extern XkbRF_VarDescPtr XkbRF_AddVarDesc( +extern _X_EXPORT XkbRF_VarDescPtr XkbRF_AddVarDesc( XkbRF_DescribeVarsPtr /* vars */ ); -extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy( +extern _X_EXPORT XkbRF_VarDescPtr XkbRF_AddVarDescCopy( XkbRF_DescribeVarsPtr /* vars */, XkbRF_VarDescPtr /* copy_from */ ); -extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( +extern _X_EXPORT XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( XkbRF_RulesPtr /* rules */, char * /* name */ ); -extern Bool XkbRF_LoadDescriptions( +extern _X_EXPORT Bool XkbRF_LoadDescriptions( FILE * /* file */, XkbRF_RulesPtr /* rules */ ); -extern Bool XkbRF_LoadDescriptionsByName( +extern _X_EXPORT Bool XkbRF_LoadDescriptionsByName( char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ ); -extern XkbRF_RulesPtr XkbRF_Load( +extern _X_EXPORT XkbRF_RulesPtr XkbRF_Load( char * /* base */, char * /* locale */, Bool /* wantDesc */, Bool /* wantRules */ ); -extern XkbRF_RulesPtr XkbRF_Create( +extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create( int /* sz_rules */, int /* sz_extra */ ); /***====================================================================***/ -extern void XkbRF_Free( +extern _X_EXPORT void XkbRF_Free( XkbRF_RulesPtr /* rules */, Bool /* freeRules */ ); |