summaryrefslogtreecommitdiff
path: root/xkb/xkbtext.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/xkbtext.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/xkbtext.c')
-rw-r--r--xkb/xkbtext.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 18c42ba51..d08c91589 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -68,7 +68,7 @@ char *rtrn;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbAtomText(Atom atm,unsigned format)
{
char *rtrn,*tmp;
@@ -100,7 +100,7 @@ char *rtrn,*tmp;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbVModIndexText(XkbDescPtr xkb,unsigned ndx,unsigned format)
{
register int len;
@@ -134,7 +134,7 @@ char numBuf[20];
return rtrn;
}
-_X_EXPORT char *
+char *
XkbVModMaskText( XkbDescPtr xkb,
unsigned modMask,
unsigned mask,
@@ -216,7 +216,7 @@ static char *modNames[XkbNumModifiers] = {
"Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5"
};
-_X_EXPORT char *
+char *
XkbModIndexText(unsigned ndx,unsigned format)
{
char * rtrn;
@@ -241,7 +241,7 @@ char buf[100];
return rtrn;
}
-_X_EXPORT char *
+char *
XkbModMaskText(unsigned mask,unsigned format)
{
register int i,bit;
@@ -281,7 +281,7 @@ char buf[64],*rtrn;
/***====================================================================***/
/*ARGSUSED*/
-_X_EXPORT char *
+char *
XkbConfigText(unsigned config,unsigned format)
{
static char *buf;
@@ -328,7 +328,7 @@ static char *buf;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbKeysymText(KeySym sym,unsigned format)
{
static char buf[32],*rtrn;
@@ -339,7 +339,7 @@ static char buf[32],*rtrn;
return rtrn;
}
-_X_EXPORT char *
+char *
XkbKeyNameText(char *name,unsigned format)
{
char *buf;
@@ -368,7 +368,7 @@ static char *siMatchText[5] = {
"NoneOf", "AnyOfOrNone", "AnyOf", "AllOf", "Exactly"
};
-_X_EXPORT char *
+char *
XkbSIMatchText(unsigned type,unsigned format)
{
static char buf[40];
@@ -402,7 +402,7 @@ static char *imWhichNames[]= {
"compat"
};
-_X_EXPORT char *
+char *
XkbIMWhichStateMaskText(unsigned use_which,unsigned format)
{
int len;
@@ -461,7 +461,7 @@ static char *ctrlNames[] = {
"ignoreGroupLock"
};
-_X_EXPORT char *
+char *
XkbControlsMaskText(unsigned ctrls,unsigned format)
{
int len;
@@ -508,7 +508,7 @@ char * buf;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbStringText(char *str,unsigned format)
{
char * buf;
@@ -568,7 +568,7 @@ Bool ok;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbGeomFPText(int val,unsigned format)
{
int whole,frac;
@@ -588,7 +588,7 @@ char * buf;
return buf;
}
-_X_EXPORT char *
+char *
XkbDoodadTypeText(unsigned type,unsigned format)
{
char * buf;
@@ -628,7 +628,7 @@ static char *actionTypeNames[XkbSA_NumActions]= {
"DeviceBtn", "LockDeviceBtn"
};
-_X_EXPORT char *
+char *
XkbActionTypeText(unsigned type,unsigned format)
{
static char buf[32];
@@ -1125,7 +1125,7 @@ static actionCopy copyActionArgs[XkbSA_NumActions] = {
#define ACTION_SZ 256
-_X_EXPORT char *
+char *
XkbActionText(XkbDescPtr xkb,XkbAction *action,unsigned format)
{
char buf[ACTION_SZ],*tmp;
@@ -1153,7 +1153,7 @@ int sz;
return tmp;
}
-_X_EXPORT char *
+char *
XkbBehaviorText(XkbDescPtr xkb,XkbBehavior *behavior,unsigned format)
{
char buf[256],*tmp;
@@ -1210,7 +1210,7 @@ char buf[256],*tmp;
/***====================================================================***/
-_X_EXPORT char *
+char *
XkbIndentText(unsigned size)
{
static char buf[32];