summaryrefslogtreecommitdiff
path: root/Xext/geext.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 /Xext/geext.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 'Xext/geext.c')
-rw-r--r--Xext/geext.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/Xext/geext.c b/Xext/geext.c
index 91a3b7e15..a58db038e 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -39,16 +39,16 @@
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
-_X_EXPORT int GEEventBase;
-_X_EXPORT int GEErrorBase;
+int GEEventBase;
+int GEErrorBase;
static int GEClientPrivateKeyIndex;
-_X_EXPORT DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
-_X_EXPORT int GEEventType; /* The opcode for all GenericEvents will have. */
+DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
+int GEEventType; /* The opcode for all GenericEvents will have. */
int RT_GECLIENT = 0;
-_X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
+GEExtension GEExtensions[MAXEXTENSIONS];
/* Major available requests */
static const int version_requests[] = {
@@ -101,7 +101,7 @@ ProcGEQueryVersion(ClientPtr client)
return(client->noClientException);
}
-_X_EXPORT int (*ProcGEVector[GENumberRequests])(ClientPtr) = {
+int (*ProcGEVector[GENumberRequests])(ClientPtr) = {
/* Version 1.0 */
ProcGEQueryVersion
};
@@ -122,7 +122,7 @@ SProcGEQueryVersion(ClientPtr client)
return(*ProcGEVector[stuff->ReqType])(client);
}
-_X_EXPORT int (*SProcGEVector[GENumberRequests])(ClientPtr) = {
+int (*SProcGEVector[GENumberRequests])(ClientPtr) = {
/* Version 1.0 */
SProcGEQueryVersion
};
@@ -258,7 +258,7 @@ GEClientGone(WindowPtr pWin, XID id)
* Since other extensions may rely on XGE (XInput does already), it is a good
* idea to init XGE first, before any other extension.
*/
-_X_EXPORT void
+void
GEExtensionInit(void)
{
ExtensionEntry *extEntry;
@@ -300,7 +300,7 @@ GEExtensionInit(void)
* @param ev_fill Called for an event before delivery. The extension now has
* the chance to fill in necessary fields for the event.
*/
-_X_EXPORT void
+void
GERegisterExtension(int extension,
void (*ev_swap)(xGenericEvent* from, xGenericEvent* to),
void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev,
@@ -318,7 +318,7 @@ GERegisterExtension(int extension,
/* Sets type and extension field for a generic event. This is just an
* auxiliary function, extensions could do it manually too.
*/
-_X_EXPORT void
+void
GEInitEvent(xGenericEvent* ev, int extension)
{
ev->type = GenericEvent;
@@ -356,7 +356,7 @@ GERecalculateWinMask(WindowPtr pWin)
}
/* Set generic event mask for given window. */
-_X_EXPORT void
+void
GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
WindowPtr pWin, int extension, Mask mask)
{
@@ -443,7 +443,7 @@ GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
* @param extension Extension ID
* @param mask Event mask
*/
-_X_EXPORT BOOL
+BOOL
GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev,
int extension, Mask mask)
{