[PATCH] Xext: un-export all XGE functions.

Paulo César Pereira de Andrade pcpa at mandriva.com.br
Mon Dec 8 13:09:13 PST 2008


> These functions are only to be used by X server extensions, so let's not
> expose them to the world.

  This will not work as expected if the X Server is compiled with
hidden symbols.
  For the moment at least, it must be specified as both
extern _X_EXPORT
(what may be counter intuitive I agree).

  If no modules are going to access these symbols, then they should
really be declared in a "non sdk header".

  Using extern will just cause the sdksyms.sh script to add the
symbol address to a vector (to ensure it exists), but without
effect, as it is not being exported.

> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  Xext/geext.h |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Xext/geext.h b/Xext/geext.h
> index 3074431..4d2acaf 100644
> --- a/Xext/geext.h
> +++ b/Xext/geext.h
> @@ -66,7 +66,7 @@ typedef struct _GEExtension {
>
>
>  /* All registered extensions and their handling functions. */
> -extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
> +extern GEExtension GEExtensions[MAXEXTENSIONS];
>
>  /* Returns the extension offset from the event */
>  #define GEEXT(ev) (((xGenericEvent*)(ev))->extension)
> @@ -95,20 +95,20 @@ extern _X_EXPORT GEExtension
> GEExtensions[MAXEXTENSIONS];
>
>
>  /* Interface for other extensions */
> -extern _X_EXPORT void GEWindowSetMask(ClientPtr pClient, DeviceIntPtr
> pDev,
> +extern void GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
>                       WindowPtr pWin, int extension, Mask mask);
>
> -extern _X_EXPORT void GERegisterExtension(
> +extern void GERegisterExtension(
>          int extension,
>          void (*ev_dispatch)(xGenericEvent* from, xGenericEvent* to),
>          void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev,
>                          WindowPtr pWin, GrabPtr pGrab)
>          );
>
> -extern _X_EXPORT void GEInitEvent(xGenericEvent* ev, int extension);
> -extern _X_EXPORT BOOL GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr
> pDev,
> +extern void GEInitEvent(xGenericEvent* ev, int extension);
> +extern BOOL GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev,
>                         int extension, Mask mask);
>
> -extern _X_EXPORT void GEExtensionInit(void);
> +extern void GEExtensionInit(void);
>
>  #endif /* _GEEXT_H_ */
> --
> 1.6.0.4
>
> Cheers,
>   Peter

Paulo




More information about the xorg mailing list