[PATCH 07/31] RandR: _X_UNEXPORT

Daniel Stone daniel at fooishbar.org
Fri Dec 2 03:31:13 PST 2011


Remove unnecessary _X_EXPORT tags from symbols not used by any driver.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 randr/randrstr.h    |  186 +++++++++++++++++++++++++-------------------------
 randr/rrtransform.h |   12 ++--
 2 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/randr/randrstr.h b/randr/randrstr.h
index 7e93dd6..a4022a1 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -63,10 +63,10 @@ typedef XID	RRMode;
 typedef XID	RROutput;
 typedef XID	RRCrtc;
 
-extern _X_EXPORT int	RREventBase, RRErrorBase;
+extern int	RREventBase, RRErrorBase;
 
-extern _X_EXPORT int (*ProcRandrVector[RRNumberRequests])(ClientPtr);
-extern _X_EXPORT int (*SProcRandrVector[RRNumberRequests])(ClientPtr);
+extern int (*ProcRandrVector[RRNumberRequests])(ClientPtr);
+extern int (*SProcRandrVector[RRNumberRequests])(ClientPtr);
     
 /*
  * Modeline for a monitor. Name follows directly after this struct
@@ -300,7 +300,7 @@ typedef struct _rrScrPriv {
     Bool                   discontiguous;
 } rrScrPrivRec, *rrScrPrivPtr;
 
-extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec;
+extern DevPrivateKeyRec rrPrivKeyRec;
 #define rrPrivKey (&rrPrivKeyRec)
 
 #define rrGetScrPriv(pScr)  ((rrScrPrivPtr)dixLookupPrivate(&(pScr)->devPrivates, rrPrivKey))
@@ -336,10 +336,10 @@ typedef struct _RRClient {
 /*  RRTimesRec	times[0]; */
 } RRClientRec, *RRClientPtr;
 
-extern _X_EXPORT RESTYPE RRClientType, RREventType; /* resource types for event masks */
-extern _X_EXPORT DevPrivateKeyRec RRClientPrivateKeyRec;
+extern RESTYPE RRClientType, RREventType; /* resource types for event masks */
+extern DevPrivateKeyRec RRClientPrivateKeyRec;
 #define RRClientPrivateKey (&RRClientPrivateKeyRec)
-extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType;
+extern RESTYPE RRCrtcType, RRModeType, RROutputType;
 
 #define VERIFY_RR_OUTPUT(id, ptr, a)\
     {\
@@ -378,7 +378,7 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType;
 /*
  * Set the range of sizes for the screen
  */
-extern _X_EXPORT void
+extern void
 RRScreenSetSizeRange (ScreenPtr	pScreen,
 		      CARD16	minWidth,
 		      CARD16	minHeight,
@@ -392,13 +392,13 @@ RRScreenSetSizeRange (ScreenPtr	pScreen,
  * The driver is responsible for calling this whenever it has changed
  * the size of the screen
  */
-extern _X_EXPORT void
+extern void
 RRScreenSizeNotify (ScreenPtr	pScreen);
 
 /*
  * Request that the screen be resized
  */
-extern _X_EXPORT Bool
+extern Bool
 RRScreenSizeSet (ScreenPtr  pScreen,
 		 CARD16	    width,
 		 CARD16	    height,
@@ -408,41 +408,41 @@ RRScreenSizeSet (ScreenPtr  pScreen,
 /*
  * Send ConfigureNotify event to root window when 'something' happens
  */
-extern _X_EXPORT void
+extern void
 RRSendConfigNotify (ScreenPtr pScreen);
     
 /*
  * screen dispatch
  */
-extern _X_EXPORT int
+extern int
 ProcRRGetScreenSizeRange (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetScreenSize (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetScreenResources (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetScreenResourcesCurrent (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetScreenConfig (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetScreenInfo (ClientPtr client);
 
 /*
  * Deliver a ScreenNotify event
  */
-extern _X_EXPORT void
+extern void
 RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen);
     
 /* randr.c */
 /*
  * Send all pending events
  */
-extern _X_EXPORT void
+extern void
 RRTellChanged (ScreenPtr pScreen);
 
 /*
@@ -451,14 +451,14 @@ RRTellChanged (ScreenPtr pScreen);
 extern _X_EXPORT Bool
 RRGetInfo (ScreenPtr pScreen, Bool force_query);
 
-extern _X_EXPORT Bool RRInit (void);
+extern Bool RRInit (void);
 
-extern _X_EXPORT Bool RRScreenInit(ScreenPtr pScreen);
+extern Bool RRScreenInit(ScreenPtr pScreen);
 
-extern _X_EXPORT RROutputPtr
+extern RROutputPtr
 RRFirstOutput (ScreenPtr pScreen);
 
-extern _X_EXPORT CARD16
+extern CARD16
 RRVerticalRefresh (xRRModeInfo *mode);
 
 #ifdef RANDR_10_INTERFACE					
@@ -471,14 +471,14 @@ RRVerticalRefresh (xRRModeInfo *mode);
  * Then, register the specific size with the screen
  */
 
-extern _X_EXPORT RRScreenSizePtr
+extern RRScreenSizePtr
 RRRegisterSize (ScreenPtr		pScreen,
 		short			width, 
 		short			height,
 		short			mmWidth,
 		short			mmHeight);
 
-extern _X_EXPORT Bool
+extern Bool
 RRRegisterRate (ScreenPtr		pScreen,
 		     RRScreenSizePtr	pSize,
 		     int		rate);
@@ -487,13 +487,13 @@ RRRegisterRate (ScreenPtr		pScreen,
  * Finally, set the current configuration of the screen
  */
 
-extern _X_EXPORT void
+extern void
 RRSetCurrentConfig (ScreenPtr		pScreen,
 		    Rotation		rotation,
 		    int			rate,
 		    RRScreenSizePtr	pSize);
 
-extern _X_EXPORT Rotation
+extern Rotation
 RRGetRotation (ScreenPtr pScreen);
 
 #endif					
@@ -504,32 +504,32 @@ RRGetRotation (ScreenPtr pScreen);
  * Notify the CRTC of some change; layoutChanged indicates that
  * some position or size element changed
  */
-extern _X_EXPORT void
+extern void
 RRCrtcChanged (RRCrtcPtr crtc, Bool layoutChanged);
 
 /*
  * Create a CRTC
  */
-extern _X_EXPORT RRCrtcPtr
+extern RRCrtcPtr
 RRCrtcCreate (ScreenPtr pScreen, void	*devPrivate);
 
 /*
  * Set the allowed rotations on a CRTC
  */
-extern _X_EXPORT void
+extern void
 RRCrtcSetRotations (RRCrtcPtr crtc, Rotation rotations);
 
 /*
  * Set whether transforms are allowed on a CRTC
  */
-extern _X_EXPORT void
+extern void
 RRCrtcSetTransformSupport (RRCrtcPtr crtc, Bool transforms);
 
 /*
  * Notify the extension that the Crtc has been reconfigured,
  * the driver calls this whenever it has updated the mode
  */
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcNotify (RRCrtcPtr	    crtc,
 	      RRModePtr	    mode,
 	      int	    x,
@@ -539,13 +539,13 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	      int	    numOutputs,
 	      RROutputPtr   *outputs);
 
-extern _X_EXPORT void
+extern void
 RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc);
     
 /*
  * Request that the Crtc be reconfigured
  */
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcSet (RRCrtcPtr    crtc,
 	   RRModePtr	mode,
 	   int		x,
@@ -569,7 +569,7 @@ RRCrtcGammaSet (RRCrtcPtr   crtc,
  * This includes gamma size.
  */
  
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcGammaGet(RRCrtcPtr crtc);
 
 /*
@@ -578,14 +578,14 @@ RRCrtcGammaGet(RRCrtcPtr crtc);
  * in the RRCrtcRec
  */
 
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcGammaNotify (RRCrtcPtr	crtc);
 
 /*
  * Set the size of the gamma table at server startup time
  */
 
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcGammaSetSize (RRCrtcPtr	crtc,
 		    int		size);
 
@@ -594,7 +594,7 @@ RRCrtcGammaSetSize (RRCrtcPtr	crtc,
  * taking into account the current mode and rotation
  */
 
-extern _X_EXPORT void
+extern void
 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);
 
 /*
@@ -604,7 +604,7 @@ RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);
  *
  * Return TRUE if the resulting transform is not a simple translation.
  */
-extern _X_EXPORT Bool
+extern Bool
 RRTransformCompute (int			    x,
 		    int			    y,
 		    int			    width,
@@ -619,19 +619,19 @@ RRTransformCompute (int			    x,
 /*
  * Return crtc transform
  */
-extern _X_EXPORT RRTransformPtr
+extern RRTransformPtr
 RRCrtcGetTransform (RRCrtcPtr crtc);
 
 /*
  * Check whether the pending and current transforms are the same
  */
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcPendingTransform (RRCrtcPtr crtc);
 
 /*
  * Destroy a Crtc at shutdown
  */
-extern _X_EXPORT void
+extern void
 RRCrtcDestroy (RRCrtcPtr crtc);
 
 
@@ -639,7 +639,7 @@ RRCrtcDestroy (RRCrtcPtr crtc);
  * Set the pending CRTC transformation
  */
 
-extern _X_EXPORT int
+extern int
 RRCrtcTransformSet (RRCrtcPtr		crtc,
 		    PictTransformPtr	transform,
 		    struct pict_f_transform *f_transform,
@@ -652,38 +652,38 @@ RRCrtcTransformSet (RRCrtcPtr		crtc,
 /*
  * Initialize crtc type
  */
-extern _X_EXPORT Bool
+extern Bool
 RRCrtcInit (void);
 
 /*
  * Initialize crtc type error value
  */
-extern _X_EXPORT void
+extern void
 RRCrtcInitErrorValue (void);
 
 /*
  * Crtc dispatch
  */
 
-extern _X_EXPORT int
+extern int
 ProcRRGetCrtcInfo (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetCrtcConfig (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetCrtcGammaSize (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetCrtcGamma (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetCrtcGamma (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetCrtcTransform (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetCrtcTransform (ClientPtr client);
 
 int
@@ -696,7 +696,7 @@ void
 RRConstrainCursorHarder (DeviceIntPtr, ScreenPtr, int, int *, int *);
 
 /* rrdispatch.c */
-extern _X_EXPORT Bool
+extern Bool
 RRClientKnowsRates (ClientPtr	pClient);
 
 /* rrmode.c */
@@ -704,7 +704,7 @@ RRClientKnowsRates (ClientPtr	pClient);
  * Find, and if necessary, create a mode
  */
 
-extern _X_EXPORT RRModePtr
+extern RRModePtr
 RRModeGet (xRRModeInfo	*modeInfo,
 	   const char	*name);
 
@@ -712,37 +712,37 @@ RRModeGet (xRRModeInfo	*modeInfo,
  * Destroy a mode.
  */
 
-extern _X_EXPORT void
+extern void
 RRModeDestroy (RRModePtr mode);
 
 /*
  * Return a list of modes that are valid for some output in pScreen
  */
-extern _X_EXPORT RRModePtr *
+extern RRModePtr *
 RRModesForScreen (ScreenPtr pScreen, int *num_ret);
     
 /*
  * Initialize mode type
  */
-extern _X_EXPORT Bool
+extern Bool
 RRModeInit (void);
 
 /*
  * Initialize mode type error value
  */
-extern _X_EXPORT void
+extern void
 RRModeInitErrorValue (void);
     
-extern _X_EXPORT int
+extern int
 ProcRRCreateMode (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRDestroyMode (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRAddOutputMode (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRDeleteOutputMode (ClientPtr client);
 
 /* rroutput.c */
@@ -753,14 +753,14 @@ ProcRRDeleteOutputMode (ClientPtr client);
  * has changed, or whether the change was strictly internal
  * (which crtc is in use)
  */
-extern _X_EXPORT void
+extern void
 RROutputChanged (RROutputPtr output, Bool configChanged);
 
 /*
  * Create an output
  */
 
-extern _X_EXPORT RROutputPtr
+extern RROutputPtr
 RROutputCreate (ScreenPtr   pScreen,
 		const char  *name,
 		int	    nameLength,
@@ -769,92 +769,92 @@ RROutputCreate (ScreenPtr   pScreen,
 /*
  * Notify extension that output parameters have been changed
  */
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetClones (RROutputPtr  output,
 		   RROutputPtr  *clones,
 		   int		numClones);
 
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetModes (RROutputPtr	output,
 		  RRModePtr	*modes,
 		  int		numModes,
 		  int		numPreferred);
 
-extern _X_EXPORT int
+extern int
 RROutputAddUserMode (RROutputPtr    output,
 		     RRModePtr	    mode);
 
-extern _X_EXPORT int
+extern int
 RROutputDeleteUserMode (RROutputPtr output,
 			RRModePtr   mode);
 
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetCrtcs (RROutputPtr	output,
 		  RRCrtcPtr	*crtcs,
 		  int		numCrtcs);
 
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetConnection (RROutputPtr  output,
 		       CARD8	    connection);
 
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetSubpixelOrder (RROutputPtr output,
 			  int	      subpixelOrder);
 
-extern _X_EXPORT Bool
+extern Bool
 RROutputSetPhysicalSize (RROutputPtr	output,
 			 int		mmWidth,
 			 int		mmHeight);
 
-extern _X_EXPORT void
+extern void
 RRDeliverOutputEvent(ClientPtr client, WindowPtr pWin, RROutputPtr output);
 
-extern _X_EXPORT void
+extern void
 RROutputDestroy (RROutputPtr	output);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetOutputInfo (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRSetOutputPrimary (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetOutputPrimary (ClientPtr client);
 
 /*
  * Initialize output type
  */
-extern _X_EXPORT Bool
+extern Bool
 RROutputInit (void);
 
 /*
  * Initialize output type error value
  */
-extern _X_EXPORT void
+extern void
 RROutputInitErrorValue (void);
     
 /* rrpointer.c */
-extern _X_EXPORT void
+extern void
 RRPointerMoved (ScreenPtr pScreen, int x, int y);
 
-extern _X_EXPORT void
+extern void
 RRPointerScreenConfigured (ScreenPtr pScreen);
 
 /* rrproperty.c */
 
-extern _X_EXPORT void
+extern void
 RRDeleteAllOutputProperties (RROutputPtr output);
 
-extern _X_EXPORT RRPropertyValuePtr
+extern RRPropertyValuePtr
 RRGetOutputProperty (RROutputPtr output, Atom property, Bool pending);
 
-extern _X_EXPORT RRPropertyPtr
+extern RRPropertyPtr
 RRQueryOutputProperty (RROutputPtr output, Atom property);
 		       
-extern _X_EXPORT void
+extern void
 RRDeleteOutputProperty (RROutputPtr output, Atom property);
 
-extern _X_EXPORT Bool
+extern Bool
 RRPostPendingProperties (RROutputPtr output);
     
 extern _X_EXPORT int
@@ -866,27 +866,27 @@ extern _X_EXPORT int
 RRConfigureOutputProperty (RROutputPtr output, Atom property,
 			   Bool pending, Bool range, Bool immutable,
 			   int num_values, INT32 *values);
-extern _X_EXPORT int
+extern int
 ProcRRChangeOutputProperty (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRGetOutputProperty (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRListOutputProperties (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRQueryOutputProperty (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRConfigureOutputProperty (ClientPtr client);
 
-extern _X_EXPORT int
+extern int
 ProcRRDeleteOutputProperty (ClientPtr client);
 
 /* rrxinerama.c */
 #ifdef XINERAMA
-extern _X_EXPORT void
+extern void
 RRXineramaExtensionInit(void);
 #endif
 
diff --git a/randr/rrtransform.h b/randr/rrtransform.h
index 561762d..3ca3078 100644
--- a/randr/rrtransform.h
+++ b/randr/rrtransform.h
@@ -39,16 +39,16 @@ struct _rrTransform {
     int		    height;
 };
 
-extern _X_EXPORT void
+extern void
 RRTransformInit (RRTransformPtr transform);
 
-extern _X_EXPORT void
+extern void
 RRTransformFini (RRTransformPtr transform);
 
-extern _X_EXPORT Bool
+extern Bool
 RRTransformEqual (RRTransformPtr a, RRTransformPtr b);
 
-extern _X_EXPORT Bool
+extern Bool
 RRTransformSetFilter (RRTransformPtr	dst,
 		      PictFilterPtr	filter,
 		      xFixed		*params,
@@ -56,10 +56,10 @@ RRTransformSetFilter (RRTransformPtr	dst,
 		      int		width,
 		      int		height);
 
-extern _X_EXPORT Bool
+extern Bool
 RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);
 
-extern _X_EXPORT Bool
+extern Bool
 RRTransformCompute (int			    x,
 		    int			    y,
 		    int			    width,
-- 
1.7.7.3



More information about the xorg-devel mailing list