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/xkbAccessX.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/xkbAccessX.c')
-rw-r--r-- | xkb/xkbAccessX.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index ccdc033e6..0cc3b80b3 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -40,9 +40,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <sys/time.h> #endif -_X_EXPORT int XkbDfltRepeatDelay= 660; -_X_EXPORT int XkbDfltRepeatInterval= 40; -_X_EXPORT pointer XkbLastRepeatEvent= NULL; +int XkbDfltRepeatDelay= 660; +int XkbDfltRepeatInterval= 40; +pointer XkbLastRepeatEvent= NULL; #define DFLT_TIMEOUT_CTRLS (XkbAX_KRGMask|XkbStickyKeysMask|XkbMouseKeysMask) #define DFLT_TIMEOUT_OPTS (XkbAX_IndicatorFBMask) @@ -55,7 +55,7 @@ static unsigned int XkbDfltAccessXTimeoutOptionsValues= 0; unsigned int XkbDfltAccessXFeedback= XkbAccessXFeedbackMask; unsigned short XkbDfltAccessXOptions= XkbAX_AllOptionsMask & ~(XkbAX_IndicatorFBMask|XkbAX_SKReleaseFBMask|XkbAX_SKRejectFBMask); -_X_EXPORT void +void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi,XkbControlsPtr ctrls) { xkbi->mouseKeysCurve= 1.0+(((double)ctrls->mk_curve)*0.001); @@ -64,7 +64,7 @@ AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi,XkbControlsPtr ctrls) return; } -_X_EXPORT void +void AccessXInit(DeviceIntPtr keybd) { XkbSrvInfoPtr xkbi = keybd->key->xkbInfo; @@ -317,7 +317,7 @@ KeyCode key; return xkbi->desc->ctrls->repeat_interval; } -_X_EXPORT void +void AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi,KeyCode key) { if (xkbi->repeatKey==key) @@ -442,7 +442,7 @@ XkbSrvLedInfoPtr sli; /* Returns FALSE if the event needs further processing. */ /* */ /************************************************************************/ -_X_EXPORT Bool +Bool AccessXFilterPressEvent( register xEvent * xE, register DeviceIntPtr keybd, int count) @@ -572,7 +572,7 @@ KeySym * sym = XkbKeySymsPtr(xkbi->desc,key); /* Returns FALSE if the event needs further processing. */ /* */ /************************************************************************/ -_X_EXPORT Bool +Bool AccessXFilterReleaseEvent( register xEvent * xE, register DeviceIntPtr keybd, int count) @@ -682,7 +682,7 @@ Bool ignoreKeyEvent = FALSE; /************************************************************************/ extern int xkbDevicePrivateIndex; extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); -_X_EXPORT void +void ProcessPointerEvent( register xEvent * xE, register DeviceIntPtr mouse, int count) |