summaryrefslogtreecommitdiff
path: root/xkb/xkbfmisc.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/xkbfmisc.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/xkbfmisc.c')
-rw-r--r--xkb/xkbfmisc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 50b175a34..ae752e945 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -48,7 +48,7 @@
#include "xkbgeom.h"
#include "xkb.h"
-_X_EXPORT unsigned
+unsigned
_XkbKSCheckCase(KeySym ks)
{
unsigned set,rtrn;
@@ -157,7 +157,7 @@ _AddIncl( FILE * file,
return;
}
-_X_EXPORT Bool
+Bool
XkbWriteXKBKeymapForNames( FILE * file,
XkbComponentNamesPtr names,
XkbDescPtr xkb,
@@ -354,7 +354,7 @@ unsigned wantNames,wantConfig,wantDflts;
/***====================================================================***/
-_X_EXPORT int
+int
XkbFindKeycodeByName(XkbDescPtr xkb,char *name,Bool use_aliases)
{
register int i;
@@ -387,7 +387,7 @@ register int i;
}
-_X_EXPORT unsigned
+unsigned
XkbConvertGetByNameComponents(Bool toXkm,unsigned orig)
{
unsigned rtrn;
@@ -423,7 +423,7 @@ static unsigned char componentSpecLegal[] = {
0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff
};
-_X_EXPORT void
+void
XkbEnsureSafeMapName(char *name)
{
if (name==NULL)
@@ -440,7 +440,7 @@ XkbEnsureSafeMapName(char *name)
#define UNMATCHABLE(c) (((c)=='(')||((c)==')')||((c)=='/'))
-_X_EXPORT Bool
+Bool
XkbNameMatchesPattern(char *name,char *ptrn)
{
while (ptrn[0]!='\0') {