[PATCH 03/31] Input: _X_UNEXPORT

Peter Hutterer peter.hutterer at who-t.net
Tue Dec 6 14:45:03 PST 2011


On Fri, Dec 02, 2011 at 11:31:09AM +0000, Daniel Stone wrote:
> Remove _X_EXPORT tag from needlessly exported symbols.
> 
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>

PickPointer(), IsMaster() and quite a few others are used by VNC. Adam
should be able to give you a list of these.

Cheers,
  Peter

> ---
>  include/XIstubs.h      |    6 +++---
>  include/cursor.h       |   26 +++++++++++++-------------
>  include/dix.h          |   28 ++++++++++++++--------------
>  include/dixevents.h    |   38 +++++++++++++++++++-------------------
>  include/dixgrabs.h     |    8 ++++----
>  include/eventconvert.h |   12 ++++++------
>  include/exevents.h     |    4 ++--
>  include/extinit.h      |    2 +-
>  include/input.h        |   30 +++++++++++++++---------------
>  include/ptrveloc.h     |   12 ++++++------
>  include/swaprep.h      |   18 +++++++++---------
>  include/window.h       |    4 ++--
>  12 files changed, 94 insertions(+), 94 deletions(-)
> 
> diff --git a/include/XIstubs.h b/include/XIstubs.h
> index 6ab82df..eea5868 100644
> --- a/include/XIstubs.h
> +++ b/include/XIstubs.h
> @@ -26,13 +26,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  #ifndef XI_STUBS_H
>  #define XI_STUBS_H 1
>  
> -extern _X_EXPORT int
> +extern int
>  SetDeviceMode (
>  	ClientPtr              /* client */,
>  	DeviceIntPtr           /* dev */,
>  	int                    /* mode */);
>  
> -extern _X_EXPORT int
> +extern int
>  SetDeviceValuators (
>  	ClientPtr              /* client */,
>  	DeviceIntPtr           /* dev */,
> @@ -40,7 +40,7 @@ SetDeviceValuators (
>  	int                    /* first_valuator */,
>  	int                    /* num_valuators */);
>  
> -extern _X_EXPORT int
> +extern int
>  ChangeDeviceControl (
>  	ClientPtr             /* client */,
>  	DeviceIntPtr          /* dev */,
> diff --git a/include/cursor.h b/include/cursor.h
> index 394383a..0ef42a4 100644
> --- a/include/cursor.h
> +++ b/include/cursor.h
> @@ -63,16 +63,16 @@ struct _DeviceIntRec;
>  typedef struct _Cursor *CursorPtr;
>  typedef struct _CursorMetric *CursorMetricPtr;
>  
> -extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
> +extern DevScreenPrivateKeyRec cursorScreenDevPriv;
>  #define CursorScreenKey (&cursorScreenDevPriv)
>  
> -extern _X_EXPORT CursorPtr rootCursor;
> +extern CursorPtr rootCursor;
>  
> -extern _X_EXPORT int FreeCursor(
> +extern int FreeCursor(
>      pointer /*pCurs*/,
>      XID /*cid*/);
>  
> -extern _X_EXPORT int AllocARGBCursor(
> +extern int AllocARGBCursor(
>      unsigned char* /*psrcbits*/,
>      unsigned char* /*pmaskbits*/,
>      CARD32* /*argb*/,
> @@ -87,7 +87,7 @@ extern _X_EXPORT int AllocARGBCursor(
>      ClientPtr /*client*/,
>      XID /*cid*/);
>  
> -extern _X_EXPORT int AllocGlyphCursor(
> +extern int AllocGlyphCursor(
>      Font /*source*/,
>      unsigned int /*sourceChar*/,
>      Font /*mask*/,
> @@ -102,39 +102,39 @@ extern _X_EXPORT int AllocGlyphCursor(
>      ClientPtr /*client*/,
>      XID /*cid*/);
>  
> -extern _X_EXPORT CursorPtr CreateRootCursor(
> +extern CursorPtr CreateRootCursor(
>      char* /*pfilename*/,
>      unsigned int /*glyph*/);
>  
> -extern _X_EXPORT int ServerBitsFromGlyph(
> +extern int ServerBitsFromGlyph(
>      FontPtr /*pfont*/,
>      unsigned int /*ch*/,
>      CursorMetricPtr /*cm*/,
>      unsigned char ** /*ppbits*/);
>  
> -extern _X_EXPORT Bool CursorMetricsFromGlyph(
> +extern Bool CursorMetricsFromGlyph(
>      FontPtr /*pfont*/,
>      unsigned /*ch*/,
>      CursorMetricPtr /*cm*/);
>  
> -extern _X_EXPORT void CheckCursorConfinement(
> +extern void CheckCursorConfinement(
>      WindowPtr /*pWin*/);
>  
> -extern _X_EXPORT void NewCurrentScreen(
> +extern void NewCurrentScreen(
>      struct _DeviceIntRec* /*pDev*/,
>      ScreenPtr /*newScreen*/,
>      int /*x*/,
>      int /*y*/);
>  
> -extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */);
> +extern Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */);
>  
> -extern _X_EXPORT void GetSpritePosition(
> +extern void GetSpritePosition(
>      struct _DeviceIntRec* /* pDev */,
>      int * /*px*/,
>      int * /*py*/);
>  
>  #ifdef PANORAMIX
> -extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec* pDev);
> +extern int XineramaGetCursorScreen(struct _DeviceIntRec* pDev);
>  #endif /* PANORAMIX */
>  
>  #endif /* CURSOR_H */
> diff --git a/include/dix.h b/include/dix.h
> index 1c1fb96..ab70596 100644
> --- a/include/dix.h
> +++ b/include/dix.h
> @@ -140,7 +140,7 @@ typedef struct _TimeStamp {
>  
>  /* dispatch.c */
>  
> -extern _X_EXPORT void SetInputCheck(
> +extern void SetInputCheck(
>      HWEventQueuePtr /*c0*/,
>      HWEventQueuePtr /*c1*/);
>  
> @@ -321,7 +321,7 @@ extern void SetMaskForEvent(
>      Mask /* mask */,
>      int /* event */);
>  
> -extern _X_EXPORT void ConfineToShape(
> +extern void ConfineToShape(
>      DeviceIntPtr /* pDev */, 
>      RegionPtr /* shape */, 
>      int*      /* px */,
> @@ -333,10 +333,10 @@ extern _X_EXPORT Bool IsParent(
>  
>  extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev);
>  
> -extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
> +extern WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
>  
>  
> -extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
> +extern void NoticeEventTime(InternalEvent *ev);
>  
>  extern void EnqueueEvent(
>      InternalEvent * /* ev */,
> @@ -381,7 +381,7 @@ extern GrabPtr CheckPassiveGrabsOnWindow(
>      BOOL /* checkCore */,
>      BOOL /* activate */);
>  
> -extern _X_EXPORT int DeliverEventsToWindow(
> +extern int DeliverEventsToWindow(
>      DeviceIntPtr /* pWin */,
>      WindowPtr /* pWin */,
>      xEventPtr /* pEvents */,
> @@ -389,7 +389,7 @@ extern _X_EXPORT int DeliverEventsToWindow(
>      Mask /* filter */,
>      GrabPtr /* grab */);
>  
> -extern _X_EXPORT void DeliverRawEvent(
> +extern void DeliverRawEvent(
>      RawDeviceEvent* /* ev */,
>      DeviceIntPtr /* dev */
>  );
> @@ -409,7 +409,7 @@ extern void UpdateSpriteForScreen(
>      DeviceIntPtr /* pDev */,
>      ScreenPtr /* pScreen */);
>  
> -extern _X_EXPORT void WindowHasNewCursor(
> +extern void WindowHasNewCursor(
>      WindowPtr /* pWin */);
>  
>  extern Bool CheckDeviceGrabs(
> @@ -481,7 +481,7 @@ extern Mask EventMaskForClient(
>  
>  
>  
> -extern _X_EXPORT int DeliverEvents(
> +extern int DeliverEvents(
>      WindowPtr /*pWin*/,
>      xEventPtr /*xE*/,
>      int /*count*/,
> @@ -511,10 +511,10 @@ extern int SetClientPointer(
>          ClientPtr /* client */,
>          DeviceIntPtr /* device */);
>  
> -extern _X_EXPORT DeviceIntPtr PickPointer(
> +extern DeviceIntPtr PickPointer(
>      ClientPtr /* client */);
>  
> -extern _X_EXPORT DeviceIntPtr PickKeyboard(
> +extern DeviceIntPtr PickKeyboard(
>      ClientPtr /* client */);
>  
>  extern Bool IsInterferingGrab(
> @@ -573,11 +573,11 @@ typedef struct {
>  
>  extern int XItoCoreType(int xi_type);
>  extern Bool DevHasCursor(DeviceIntPtr pDev);
> -extern _X_EXPORT Bool IsPointerDevice(DeviceIntPtr dev);
> -extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev);
> +extern Bool IsPointerDevice(DeviceIntPtr dev);
> +extern Bool IsKeyboardDevice(DeviceIntPtr dev);
>  extern Bool IsPointerEvent(InternalEvent *event);
> -extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
> -extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev);
> +extern Bool IsMaster(DeviceIntPtr dev);
> +extern Bool IsFloating(DeviceIntPtr dev);
>  
>  extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
>  extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
> diff --git a/include/dixevents.h b/include/dixevents.h
> index b915345..ac007fb 100644
> --- a/include/dixevents.h
> +++ b/include/dixevents.h
> @@ -28,18 +28,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  
>  extern _X_EXPORT void SetCriticalEvent(int /* event */);
>  
> -extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev*/);
> +extern CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev*/);
>  
> -extern _X_EXPORT int ProcAllowEvents(ClientPtr /* client */);
> +extern int ProcAllowEvents(ClientPtr /* client */);
>  
> -extern _X_EXPORT int MaybeDeliverEventsToClient(
> +extern int MaybeDeliverEventsToClient(
>  	WindowPtr              /* pWin */,
>  	xEvent *               /* pEvents */,
>  	int                    /* count */,
>  	Mask                   /* filter */,
>  	ClientPtr              /* dontClient */);
>  
> -extern _X_EXPORT int ProcWarpPointer(ClientPtr /* client */);
> +extern int ProcWarpPointer(ClientPtr /* client */);
>  
>  extern _X_EXPORT int EventSelectForWindow(
>  	WindowPtr              /* pWin */,
> @@ -52,36 +52,36 @@ extern _X_EXPORT int EventSuppressForWindow(
>  	Mask                   /* mask */,
>  	Bool *                 /* checkOptional */);
>  
> -extern _X_EXPORT int ProcSetInputFocus(ClientPtr /* client */);
> +extern int ProcSetInputFocus(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcGetInputFocus(ClientPtr /* client */);
> +extern int ProcGetInputFocus(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcGrabPointer(ClientPtr /* client */);
> +extern int ProcGrabPointer(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcChangeActivePointerGrab(ClientPtr /* client */);
> +extern int ProcChangeActivePointerGrab(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcUngrabPointer(ClientPtr /* client */);
> +extern int ProcUngrabPointer(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcGrabKeyboard(ClientPtr /* client */);
> +extern int ProcGrabKeyboard(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcUngrabKeyboard(ClientPtr /* client */);
> +extern int ProcUngrabKeyboard(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcQueryPointer(ClientPtr /* client */);
> +extern int ProcQueryPointer(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcSendEvent(ClientPtr /* client */);
> +extern int ProcSendEvent(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcUngrabKey(ClientPtr /* client */);
> +extern int ProcUngrabKey(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcGrabKey(ClientPtr /* client */);
> +extern int ProcGrabKey(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcGrabButton(ClientPtr /* client */);
> +extern int ProcGrabButton(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */);
> +extern int ProcUngrabButton(ClientPtr /* client */);
>  
> -extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */);
> +extern int ProcRecolorCursor(ClientPtr /* client */);
>  
>  #ifdef PANORAMIX
> -extern _X_EXPORT void PostSyntheticMotion(DeviceIntPtr pDev,
> +extern void PostSyntheticMotion(DeviceIntPtr pDev,
>                                  int x, 
>                                  int y, 
>                                  int screen,
> diff --git a/include/dixgrabs.h b/include/dixgrabs.h
> index 229c8bb..4c162e8 100644
> --- a/include/dixgrabs.h
> +++ b/include/dixgrabs.h
> @@ -44,20 +44,20 @@ extern GrabPtr CreateGrab(
>          WindowPtr /* confineTo */,
>          CursorPtr /* cursor */);
>  
> -extern _X_EXPORT int DeletePassiveGrab(
> +extern int DeletePassiveGrab(
>  	pointer /* value */,
>  	XID /* id */);
>  
> -extern _X_EXPORT Bool GrabMatchesSecond(
> +extern Bool GrabMatchesSecond(
>  	GrabPtr /* pFirstGrab */,
>  	GrabPtr /* pSecondGrab */,
>  	Bool /*ignoreDevice*/);
>  
> -extern _X_EXPORT int AddPassiveGrabToList(
> +extern int AddPassiveGrabToList(
>  	ClientPtr /* client */,
>  	GrabPtr /* pGrab */);
>  
> -extern _X_EXPORT Bool DeletePassiveGrabFromList(
> +extern Bool DeletePassiveGrabFromList(
>  	GrabPtr /* pMinuendGrab */);
>  
>  #endif /* DIXGRABS_H */
> diff --git a/include/eventconvert.h b/include/eventconvert.h
> index b000abc..101f7dc 100644
> --- a/include/eventconvert.h
> +++ b/include/eventconvert.h
> @@ -30,11 +30,11 @@
>  
>  #define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
>  
> -_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);
> -_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
> -_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
> -_X_INTERNAL int GetCoreType(InternalEvent* ev);
> -_X_INTERNAL int GetXIType(InternalEvent* ev);
> -_X_INTERNAL int GetXI2Type(InternalEvent* ev);
> +int EventToCore(InternalEvent *event, xEvent **core, int *count);
> +int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
> +int EventToXI2(InternalEvent *ev, xEvent **xi);
> +int GetCoreType(InternalEvent* ev);
> +int GetXIType(InternalEvent* ev);
> +int GetXI2Type(InternalEvent* ev);
>  
>  #endif /* _EVENTCONVERT_H_ */
> diff --git a/include/exevents.h b/include/exevents.h
> index 12ea378..83a6b3d 100644
> --- a/include/exevents.h
> +++ b/include/exevents.h
> @@ -96,7 +96,7 @@ extern _X_EXPORT int XIChangeDeviceProperty(
>          Bool                    /* sendevent*/
>          );
>  
> -extern _X_EXPORT int XIGetDeviceProperty(
> +extern int XIGetDeviceProperty(
>          DeviceIntPtr            /* dev */,
>          Atom                    /* property */,
>          XIPropertyValuePtr*     /* value */
> @@ -129,7 +129,7 @@ extern _X_EXPORT Atom XIGetKnownProperty(
>          const char*           name
>  );
>  
> -extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev);
> +extern DeviceIntPtr XIGetDevice(xEvent *ev);
>  
>  extern _X_EXPORT int XIPropToInt(
>          XIPropertyValuePtr val,
> diff --git a/include/extinit.h b/include/extinit.h
> index 5be45ac..ca7f5b2 100644
> --- a/include/extinit.h
> +++ b/include/extinit.h
> @@ -153,7 +153,7 @@ extern void XFixesExtensionInit(void);
>  #endif
>  
>  extern void XInputExtensionInit(void);
> -extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name);
> +extern void AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name);
>  
>  #include <X11/extensions/XKB.h>
>  extern void XkbExtensionInit(void);
> diff --git a/include/input.h b/include/input.h
> index 8e7b47a..5cfd64f 100644
> --- a/include/input.h
> +++ b/include/input.h
> @@ -201,8 +201,8 @@ typedef struct {
>      unsigned char id;
>  } LedCtrl;
>  
> -extern _X_EXPORT KeybdCtrl	defaultKeyboardControl;
> -extern _X_EXPORT PtrCtrl	defaultPointerControl;
> +extern KeybdCtrl	defaultKeyboardControl;
> +extern PtrCtrl	defaultPointerControl;
>  
>  typedef struct _InputOption InputOption;
>  
> @@ -267,19 +267,19 @@ extern _X_EXPORT int RemoveDevice(
>      DeviceIntPtr /*dev*/,
>      BOOL /* sendevent */);
>  
> -extern _X_EXPORT int NumMotionEvents(void);
> +extern int NumMotionEvents(void);
>  
> -extern _X_EXPORT int dixLookupDevice(
> +extern int dixLookupDevice(
>      DeviceIntPtr *         /* dev */,
>      int                    /* id */,
>      ClientPtr              /* client */,
>      Mask                   /* access_mode */);
>  
> -extern _X_EXPORT void QueryMinMaxKeyCodes(
> +extern void QueryMinMaxKeyCodes(
>      KeyCode* /*minCode*/,
>      KeyCode* /*maxCode*/);
>  
> -extern _X_EXPORT Bool SetKeySymsMap(
> +extern Bool SetKeySymsMap(
>      KeySymsPtr /*dst*/,
>      KeySymsPtr /*src*/);
>  
> @@ -412,17 +412,17 @@ extern Bool LegalModifier(
>      unsigned int /*key*/, 
>      DeviceIntPtr /*pDev*/);
>  
> -extern _X_EXPORT void ProcessInputEvents(void);
> +extern void ProcessInputEvents(void);
>  
> -extern _X_EXPORT void InitInput(
> +extern void InitInput(
>      int  /*argc*/,
>      char ** /*argv*/);
> -extern _X_EXPORT void CloseInput(void);
> +extern void CloseInput(void);
>  
>  extern _X_EXPORT int GetMaximumEventsNum(void);
>  
> -extern _X_EXPORT InternalEvent *InitEventList(int num_events);
> -extern _X_EXPORT void FreeEventList(InternalEvent *list, int num_events);
> +extern InternalEvent *InitEventList(int num_events);
> +extern void FreeEventList(InternalEvent *list, int num_events);
>  
>  extern void CreateClassesChangedEvent(InternalEvent *event,
>                                        DeviceIntPtr master,
> @@ -484,10 +484,10 @@ extern void PostSyntheticMotion(
>  extern _X_EXPORT int GetMotionHistorySize(
>      void);
>  
> -extern _X_EXPORT void AllocateMotionHistory(
> +extern void AllocateMotionHistory(
>      DeviceIntPtr pDev);
>  
> -extern _X_EXPORT int GetMotionHistory(
> +extern int GetMotionHistory(
>      DeviceIntPtr pDev,
>      xTimecoord **buff,
>      unsigned long start,
> @@ -516,7 +516,7 @@ extern void DeepCopyDeviceClasses(DeviceIntPtr from,
>                                    DeviceChangedEvent *dce);
>  
>  /* Helper functions. */
> -extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
> +extern int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
>                                KeyCode **modkeymap, int *max_keys_per_mod);
>  extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
>                           int max_keys_per_mod);
> @@ -564,7 +564,7 @@ extern _X_EXPORT int NewInputDeviceRequest(
>  extern  _X_EXPORT void DeleteInputDeviceRequest(
>      DeviceIntPtr dev);
>  
> -extern _X_EXPORT void DDXRingBell(
> +extern void DDXRingBell(
>      int volume,
>      int pitch,
>      int duration);
> diff --git a/include/ptrveloc.h b/include/ptrveloc.h
> index 4f76b00..dc18874 100644
> --- a/include/ptrveloc.h
> +++ b/include/ptrveloc.h
> @@ -100,23 +100,23 @@ typedef struct _PredictableAccelSchemeRec {
>      int num_prop_handlers;
>  } PredictableAccelSchemeRec, *PredictableAccelSchemePtr;
>  
> -extern _X_EXPORT void
> +extern void
>  InitVelocityData(DeviceVelocityPtr vel);
>  
> -extern _X_EXPORT void
> +extern void
>  InitTrackers(DeviceVelocityPtr vel, int ntracker);
>  
> -extern _X_EXPORT BOOL
> +extern BOOL
>  ProcessVelocityData2D(DeviceVelocityPtr vel, double dx, double dy, int time);
>  
> -extern _X_EXPORT double
> +extern double
>  BasicComputeAcceleration(DeviceIntPtr dev, DeviceVelocityPtr vel,
>      double velocity, double threshold, double acc);
>  
> -extern _X_EXPORT void
> +extern void
>  FreeVelocityData(DeviceVelocityPtr vel);
>  
> -extern _X_EXPORT int
> +extern int
>  SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num);
>  
>  extern _X_EXPORT DeviceVelocityPtr
> diff --git a/include/swaprep.h b/include/swaprep.h
> index 8c02737..848c164 100644
> --- a/include/swaprep.h
> +++ b/include/swaprep.h
> @@ -86,7 +86,7 @@ extern _X_EXPORT void SGetSelectionOwnerReply(
>      int /* size */,
>      xGetSelectionOwnerReply * /* pRep */);
>  
> -extern _X_EXPORT void SQueryPointerReply(
> +extern void SQueryPointerReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xQueryPointerReply * /* pRep */);
> @@ -96,7 +96,7 @@ extern _X_EXPORT void SwapTimeCoordWrite(
>      int /* size */,
>      xTimecoord * /* pRep */);
>  
> -extern _X_EXPORT void SGetMotionEventsReply(
> +extern void SGetMotionEventsReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetMotionEventsReply * /* pRep */);
> @@ -106,12 +106,12 @@ extern _X_EXPORT void STranslateCoordsReply(
>      int /* size */,
>      xTranslateCoordsReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetInputFocusReply(
> +extern void SGetInputFocusReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetInputFocusReply * /* pRep */);
>  
> -extern _X_EXPORT void SQueryKeymapReply(
> +extern void SQueryKeymapReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xQueryKeymapReply * /* pRep */);
> @@ -196,27 +196,27 @@ extern _X_EXPORT void SListExtensionsReply(
>      int /* size */,
>      xListExtensionsReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetKeyboardMappingReply(
> +extern void SGetKeyboardMappingReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetKeyboardMappingReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetPointerMappingReply(
> +extern void SGetPointerMappingReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetPointerMappingReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetModifierMappingReply(
> +extern void SGetModifierMappingReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetModifierMappingReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetKeyboardControlReply(
> +extern void SGetKeyboardControlReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetKeyboardControlReply * /* pRep */);
>  
> -extern _X_EXPORT void SGetPointerControlReply(
> +extern void SGetPointerControlReply(
>      ClientPtr /* pClient */,
>      int /* size */,
>      xGetPointerControlReply * /* pRep */);
> diff --git a/include/window.h b/include/window.h
> index 1fe4fad..c215f65 100644
> --- a/include/window.h
> +++ b/include/window.h
> @@ -135,12 +135,12 @@ extern _X_EXPORT int ChangeWindowAttributes(
>      XID* /*vlist*/,
>      ClientPtr /*client*/);
>  
> -extern _X_EXPORT int ChangeWindowDeviceCursor(
> +extern int ChangeWindowDeviceCursor(
>      WindowPtr /*pWin*/,
>      struct _DeviceIntRec* /*pDev*/,
>      struct _Cursor* /*pCursor*/);
>  
> -extern _X_EXPORT struct _Cursor* WindowGetDeviceCursor(
> +extern struct _Cursor* WindowGetDeviceCursor(
>      WindowPtr /*pWin*/,
>      struct _DeviceIntRec* /*pDev*/);
>  
> -- 
> 1.7.7.3


More information about the xorg-devel mailing list