summaryrefslogtreecommitdiff
path: root/xkb/xkbInit.c
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /xkb/xkbInit.c
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (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 'xkb/xkbInit.c')
-rw-r--r--xkb/xkbInit.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index c5d0a0638..82ec18c85 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -114,8 +114,8 @@ typedef struct _SrvXkmInfo {
#define XKB_DFLT_RULES_PROP True
#endif
-_X_EXPORT char * XkbBaseDirectory= XKB_BASE_DIRECTORY;
-_X_EXPORT char * XkbBinDirectory= XKB_BIN_DIRECTORY;
+char * XkbBaseDirectory= XKB_BASE_DIRECTORY;
+char * XkbBinDirectory= XKB_BIN_DIRECTORY;
static int XkbWantAccessX= 0;
static Bool rulesDefined= False;
@@ -132,7 +132,7 @@ static char * XkbOptionsUsed= NULL;
static XkbDescPtr xkb_cached_map = NULL;
-_X_EXPORT Bool noXkbExtension= XKB_DFLT_DISABLED;
+Bool noXkbExtension= XKB_DFLT_DISABLED;
static Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP;
/***====================================================================***/
@@ -248,7 +248,7 @@ XkbSetRulesUsed(XkbRF_VarDefsPtr defs)
* If @rulesFile is NULL and no previous @rulesFile has been set, the
* built-in default is chosen as default.
*/
-_X_EXPORT void
+void
XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
char *variant,char *options)
{
@@ -290,7 +290,7 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
return;
}
-_X_EXPORT void
+void
XkbDeleteRulesDflts()
{
_XkbFree(XkbRulesFile);
@@ -493,7 +493,7 @@ XkbControlsPtr ctrls;
return Success;
}
-_X_EXPORT void
+void
XkbInitDevice(DeviceIntPtr pXDev)
{
int i;
@@ -585,7 +585,7 @@ XkbEventCauseRec cause;
#define XkbMaxKeyCount MAP_LENGTH
#endif
-_X_EXPORT Bool
+Bool
XkbInitKeyboardDeviceStruct(
DeviceIntPtr dev,
XkbComponentNamesPtr names,
@@ -743,7 +743,7 @@ XkbDescPtr xkb;
* This function also computes the autorepeat accelerators for the
* default indicator feedback.
*/
-_X_EXPORT int
+int
XkbFinishDeviceInit(DeviceIntPtr pXDev)
{
XkbSrvInfoPtr xkbi;
@@ -786,7 +786,7 @@ XkbSrvLedInfoPtr sli;
* fixed-size structures for the device. Don't free anything that
* is part of this larger block.
*/
-_X_EXPORT void
+void
XkbFreeInfo(XkbSrvInfoPtr xkbi)
{
if (xkbi->radioGroups) {
@@ -836,7 +836,7 @@ extern unsigned int XkbDfltAccessXTimeoutMask;
extern unsigned int XkbDfltAccessXFeedback;
extern unsigned char XkbDfltAccessXOptions;
-_X_EXPORT int
+int
XkbProcessArguments(int argc,char *argv[],int i)
{
if (strcmp(argv[i],"-kb")==0) {
@@ -922,7 +922,7 @@ XkbProcessArguments(int argc,char *argv[],int i)
return 0;
}
-_X_EXPORT void
+void
XkbUseMsg(void)
{
ErrorF("-kb disable the X Keyboard Extension\n");