summaryrefslogtreecommitdiff
path: root/xkb/XKBMAlloc.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/XKBMAlloc.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/XKBMAlloc.c')
-rw-r--r--xkb/XKBMAlloc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index daefe4736..178b5b89a 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -43,7 +43,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/***====================================================================***/
-_X_EXPORT Status
+Status
XkbAllocClientMap(XkbDescPtr xkb,unsigned which,unsigned nTotalTypes)
{
register int i;
@@ -124,7 +124,7 @@ XkbClientMapPtr map;
return Success;
}
-_X_EXPORT Status
+Status
XkbAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions)
{
register int i;
@@ -259,7 +259,7 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
return Success;
}
-_X_EXPORT Status
+Status
XkbCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
{
register int i,rtrn;
@@ -273,7 +273,7 @@ register int i,rtrn;
return Success;
}
-_X_EXPORT Status
+Status
XkbResizeKeyType( XkbDescPtr xkb,
int type_ndx,
int map_count,
@@ -471,7 +471,7 @@ KeyCode matchingKeys[XkbMaxKeyCount],nMatchingKeys;
return Success;
}
-_X_EXPORT KeySym *
+KeySym *
XkbResizeKeySyms(XkbDescPtr xkb,int key,int needed)
{
register int i,nSyms,nKeySyms;
@@ -551,7 +551,7 @@ _ExtendRange( unsigned int old_flags,
return old_flags;
}
-_X_EXPORT Status
+Status
XkbChangeKeycodeRange( XkbDescPtr xkb,
int minKC,
int maxKC,
@@ -751,7 +751,7 @@ int tmp;
return Success;
}
-_X_EXPORT XkbAction *
+XkbAction *
XkbResizeKeyActions(XkbDescPtr xkb,int key,int needed)
{
register int i,nActs;
@@ -801,7 +801,7 @@ XkbAction *newActs;
return &xkb->server->acts[xkb->server->key_acts[key]];
}
-_X_EXPORT void
+void
XkbFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
{
XkbClientMapPtr map;
@@ -859,7 +859,7 @@ XkbClientMapPtr map;
return;
}
-_X_EXPORT void
+void
XkbFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
{
XkbServerMapPtr map;