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 /Xi/stubs.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 'Xi/stubs.c')
-rw-r--r-- | Xi/stubs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Xi/stubs.c b/Xi/stubs.c index d88d91491..d01927c73 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -80,7 +80,7 @@ SOFTWARE. * */ -_X_EXPORT void +void CloseInputDevice(DeviceIntPtr d, ClientPtr client) { } @@ -111,7 +111,7 @@ CloseInputDevice(DeviceIntPtr d, ClientPtr client) * */ -_X_EXPORT void +void AddOtherInputDevices(void) { /********************************************************************** @@ -151,7 +151,7 @@ AddOtherInputDevices(void) * */ -_X_EXPORT void +void OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) { *status = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess); @@ -169,7 +169,7 @@ OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) * */ -_X_EXPORT int +int SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode) { return BadMatch; @@ -187,7 +187,7 @@ SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode) * */ -_X_EXPORT int +int SetDeviceValuators(ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators) { @@ -202,7 +202,7 @@ SetDeviceValuators(ClientPtr client, DeviceIntPtr dev, * */ -_X_EXPORT int +int ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, xDeviceCtl * control) { @@ -227,7 +227,7 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, * Add a new device with the specified options. * */ -_X_EXPORT int +int NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) { return BadValue; @@ -240,7 +240,7 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) * Remove the specified device previously added. * */ -_X_EXPORT void +void DeleteInputDeviceRequest(DeviceIntPtr dev) { } |