diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
| commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
| tree | eebaec908150abfc0159d9ee941404918f553113 /xkb/xkbActions.c | |
| parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (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/xkbActions.c')
| -rw-r--r-- | xkb/xkbActions.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index c268795b7..64e17e9ac 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -43,9 +43,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define EXTENSION_EVENT_BASE 64 static int xkbDevicePrivateKeyIndex; -_X_EXPORT DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; +DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; -_X_EXPORT void +void xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, pointer data) { @@ -61,7 +61,7 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, } -_X_EXPORT void +void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc) { xkbDeviceInfoPtr xkbPrivPtr; @@ -1130,7 +1130,7 @@ register int i,send; return send; } -_X_EXPORT void +void XkbHandleActions(DeviceIntPtr dev,DeviceIntPtr kbd,xEvent *xE,int count) { int key,bit,i; @@ -1315,7 +1315,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev); return; } -_X_EXPORT int +int XkbLatchModifiers(DeviceIntPtr pXDev,CARD8 mask,CARD8 latches) { XkbSrvInfoPtr xkbi; @@ -1342,7 +1342,7 @@ unsigned clear; return BadValue; } -_X_EXPORT int +int XkbLatchGroup(DeviceIntPtr pXDev,int group) { XkbSrvInfoPtr xkbi; @@ -1364,7 +1364,7 @@ XkbAction act; /***====================================================================***/ -_X_EXPORT void +void XkbClearAllLatchesAndLocks( DeviceIntPtr dev, XkbSrvInfoPtr xkbi, Bool genEv, |