[PATCH 06/31] Render: _X_UNEXPORT
Daniel Stone
daniel at fooishbar.org
Fri Dec 2 03:31:12 PST 2011
Remove needless _X_EXPORT tag from symbols not used by any drivers.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
render/glyphstr.h | 30 +++++++++---------
render/mipict.h | 32 ++++++++++----------
render/picture.c | 2 +-
render/picture.h | 6 ++--
render/picturestr.h | 82 +++++++++++++++++++++++++-------------------------
5 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 49b4b54..da220d9 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -90,55 +90,55 @@ typedef struct _GlyphList {
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
-extern _X_EXPORT void
+extern void
GlyphUninit (ScreenPtr pScreen);
-extern _X_EXPORT GlyphHashSetPtr
+extern GlyphHashSetPtr
FindGlyphHashSet (CARD32 filled);
-extern _X_EXPORT GlyphRefPtr
+extern GlyphRefPtr
FindGlyphRef (GlyphHashPtr hash,
CARD32 signature,
Bool match,
unsigned char sha1[20]);
-extern _X_EXPORT GlyphPtr
+extern GlyphPtr
FindGlyphByHash (unsigned char sha1[20], int format);
-extern _X_EXPORT int
+extern int
HashGlyph (xGlyphInfo *gi,
CARD8 *bits,
unsigned long size,
unsigned char sha1[20]);
-extern _X_EXPORT void
+extern void
FreeGlyph (GlyphPtr glyph, int format);
-extern _X_EXPORT void
+extern void
AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id);
-extern _X_EXPORT Bool
+extern Bool
DeleteGlyph (GlyphSetPtr glyphSet, Glyph id);
-extern _X_EXPORT GlyphPtr
+extern GlyphPtr
FindGlyph (GlyphSetPtr glyphSet, Glyph id);
-extern _X_EXPORT GlyphPtr
+extern GlyphPtr
AllocateGlyph (xGlyphInfo *gi, int format);
-extern _X_EXPORT Bool
+extern Bool
AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet);
-extern _X_EXPORT Bool
+extern Bool
ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global);
-extern _X_EXPORT Bool
+extern Bool
ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change);
-extern _X_EXPORT GlyphSetPtr
+extern GlyphSetPtr
AllocateGlyphSet (int fdepth, PictFormatPtr format);
-extern _X_EXPORT int
+extern int
FreeGlyphSet (pointer value,
XID gid);
diff --git a/render/mipict.h b/render/mipict.h
index 4399a6f..ee2efb6 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -47,34 +47,34 @@ typedef struct _miIndexed {
#define miIndexToEntY24(mif,rgb24) ((mif)->ent[CvtR8G8B8toY15(rgb24)])
-extern _X_EXPORT int
+extern int
miCreatePicture (PicturePtr pPicture);
-extern _X_EXPORT void
+extern void
miDestroyPicture (PicturePtr pPicture);
-extern _X_EXPORT void
+extern void
miDestroyPictureClip (PicturePtr pPicture);
-extern _X_EXPORT int
+extern int
miChangePictureClip (PicturePtr pPicture,
int type,
pointer value,
int n);
-extern _X_EXPORT void
+extern void
miChangePicture (PicturePtr pPicture,
Mask mask);
-extern _X_EXPORT void
+extern void
miValidatePicture (PicturePtr pPicture,
Mask mask);
-extern _X_EXPORT int
+extern int
miChangePictureTransform (PicturePtr pPicture,
PictTransform *transform);
-extern _X_EXPORT int
+extern int
miChangePictureFilter (PicturePtr pPicture,
int filter,
xFixed *params,
@@ -100,11 +100,11 @@ miComputeCompositeRegion (RegionPtr pRegion,
extern _X_EXPORT Bool
miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
-extern _X_EXPORT Bool
+extern Bool
miRealizeGlyph (ScreenPtr pScreen,
GlyphPtr glyph);
-extern _X_EXPORT void
+extern void
miUnrealizeGlyph (ScreenPtr pScreen,
GlyphPtr glyph);
@@ -119,12 +119,12 @@ miGlyphs (CARD8 op,
GlyphListPtr list,
GlyphPtr *glyphs);
-extern _X_EXPORT void
+extern void
miRenderColorToPixel (PictFormatPtr pPict,
xRenderColor *color,
CARD32 *pixel);
-extern _X_EXPORT void
+extern void
miRenderPixelToColor (PictFormatPtr pPict,
CARD32 pixel,
xRenderColor *color);
@@ -162,21 +162,21 @@ miTriFan (CARD8 op,
extern _X_EXPORT void
miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box);
-extern _X_EXPORT void
+extern void
miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds);
extern _X_EXPORT void
miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);
-extern _X_EXPORT Bool
+extern Bool
miInitIndexed (ScreenPtr pScreen,
PictFormatPtr pFormat);
-extern _X_EXPORT void
+extern void
miCloseIndexed (ScreenPtr pScreen,
PictFormatPtr pFormat);
-extern _X_EXPORT void
+extern void
miUpdateIndexed (ScreenPtr pScreen,
PictFormatPtr pFormat,
int ndef,
diff --git a/render/picture.c b/render/picture.c
index f134596..53a502c 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -42,7 +42,7 @@
#include "picturestr.h"
#include "xace.h"
-DevPrivateKeyRec PictureScreenPrivateKeyRec;
+_X_EXPORT DevPrivateKeyRec PictureScreenPrivateKeyRec;
DevPrivateKeyRec PictureWindowPrivateKeyRec;
static int PictureGeneration;
RESTYPE PictureType;
diff --git a/render/picture.h b/render/picture.h
index e5f0d78..66c3b3d 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -169,11 +169,11 @@ typedef enum _PictFormatShort {
#define PictureCmapPolicyColor 3
#define PictureCmapPolicyAll 4
-extern _X_EXPORT int PictureCmapPolicy;
+extern int PictureCmapPolicy;
-extern _X_EXPORT int PictureParseCmapPolicy (const char *name);
+extern int PictureParseCmapPolicy (const char *name);
-extern _X_EXPORT int RenderErrBase;
+extern int RenderErrBase;
/* Fixed point updates from Carl Worth, USC, Information Sciences Institute */
diff --git a/render/picturestr.h b/render/picturestr.h
index fc5068a..18a3db9 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -371,15 +371,15 @@ typedef struct _PictureScreen {
TriFanProcPtr TriFan;
} PictureScreenRec, *PictureScreenPtr;
-extern _X_EXPORT DevPrivateKeyRec PictureScreenPrivateKeyRec;
+extern DevPrivateKeyRec PictureScreenPrivateKeyRec;
#define PictureScreenPrivateKey (&PictureScreenPrivateKeyRec)
-extern _X_EXPORT DevPrivateKeyRec PictureWindowPrivateKeyRec;
+extern DevPrivateKeyRec PictureWindowPrivateKeyRec;
#define PictureWindowPrivateKey (&PictureWindowPrivateKeyRec)
-extern _X_EXPORT RESTYPE PictureType;
-extern _X_EXPORT RESTYPE PictFormatType;
-extern _X_EXPORT RESTYPE GlyphSetType;
+extern RESTYPE PictureType;
+extern RESTYPE PictFormatType;
+extern RESTYPE GlyphSetType;
#define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey))
#define GetPictureScreenIfSet(s) (dixPrivateKeyRegistered(PictureScreenPrivateKey) ? GetPictureScreen(s) : NULL)
@@ -402,62 +402,62 @@ extern _X_EXPORT RESTYPE GlyphSetType;
} \
} \
-extern _X_EXPORT Bool
+extern Bool
PictureDestroyWindow (WindowPtr pWindow);
-extern _X_EXPORT Bool
+extern Bool
PictureCloseScreen (int Index, ScreenPtr pScreen);
-extern _X_EXPORT void
+extern void
PictureStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef);
-extern _X_EXPORT Bool
+extern Bool
PictureInitIndexedFormat (ScreenPtr pScreen, PictFormatPtr format);
-extern _X_EXPORT Bool
+extern Bool
PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel);
-extern _X_EXPORT int
+extern int
PictureGetSubpixelOrder (ScreenPtr pScreen);
-extern _X_EXPORT PictFormatPtr
+extern PictFormatPtr
PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp);
-extern _X_EXPORT PictFormatPtr
+extern PictFormatPtr
PictureMatchVisual (ScreenPtr pScreen, int depth, VisualPtr pVisual);
extern _X_EXPORT PictFormatPtr
PictureMatchFormat (ScreenPtr pScreen, int depth, CARD32 format);
-extern _X_EXPORT Bool
+extern Bool
PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
-extern _X_EXPORT int
+extern int
PictureGetFilterId (const char *filter, int len, Bool makeit);
extern _X_EXPORT char *
PictureGetFilterName (int id);
-extern _X_EXPORT int
+extern int
PictureAddFilter (ScreenPtr pScreen,
const char *filter,
PictFilterValidateParamsProcPtr ValidateParams,
int width,
int height);
-extern _X_EXPORT Bool
+extern Bool
PictureSetFilterAlias (ScreenPtr pScreen, const char *filter, const char *alias);
-extern _X_EXPORT Bool
+extern Bool
PictureSetDefaultFilters (ScreenPtr pScreen);
-extern _X_EXPORT void
+extern void
PictureResetFilters (ScreenPtr pScreen);
-extern _X_EXPORT PictFilterPtr
+extern PictFilterPtr
PictureFindFilter (ScreenPtr pScreen, char *name, int len);
-extern _X_EXPORT int
+extern int
SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter,
xFixed *params, int nparams);
@@ -465,10 +465,10 @@ extern _X_EXPORT int
SetPictureFilter (PicturePtr pPicture, char *name, int len,
xFixed *params, int nparams);
-extern _X_EXPORT Bool
+extern Bool
PictureFinishInit (void);
-extern _X_EXPORT void
+extern void
SetPictureToDefaults (PicturePtr pPicture);
extern _X_EXPORT PicturePtr
@@ -480,14 +480,14 @@ CreatePicture (Picture pid,
ClientPtr client,
int *error);
-extern _X_EXPORT int
+extern int
ChangePicture (PicturePtr pPicture,
Mask vmask,
XID *vlist,
DevUnion *ulist,
ClientPtr client);
-extern _X_EXPORT int
+extern int
SetPictureClipRects (PicturePtr pPicture,
int xOrigin,
int yOrigin,
@@ -516,7 +516,7 @@ extern _X_EXPORT int
FreePicture (pointer pPicture,
XID pid);
-extern _X_EXPORT int
+extern int
FreePictFormat (pointer pPictFormat,
XID pid);
@@ -534,7 +534,7 @@ CompositePicture (CARD8 op,
CARD16 width,
CARD16 height);
-extern _X_EXPORT void
+extern void
CompositeGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -545,14 +545,14 @@ CompositeGlyphs (CARD8 op,
GlyphListPtr lists,
GlyphPtr *glyphs);
-extern _X_EXPORT void
+extern void
CompositeRects (CARD8 op,
PicturePtr pDst,
xRenderColor *color,
int nRect,
xRectangle *rects);
-extern _X_EXPORT void
+extern void
CompositeTrapezoids (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -562,7 +562,7 @@ CompositeTrapezoids (CARD8 op,
int ntrap,
xTrapezoid *traps);
-extern _X_EXPORT void
+extern void
CompositeTriangles (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -572,7 +572,7 @@ CompositeTriangles (CARD8 op,
int ntriangles,
xTriangle *triangles);
-extern _X_EXPORT void
+extern void
CompositeTriStrip (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -582,7 +582,7 @@ CompositeTriStrip (CARD8 op,
int npoints,
xPointFixed *points);
-extern _X_EXPORT void
+extern void
CompositeTriFan (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -598,7 +598,7 @@ AnimCurInit (ScreenPtr pScreen);
int
AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid);
-extern _X_EXPORT void
+extern void
AddTraps (PicturePtr pPicture,
INT16 xOff,
INT16 yOff,
@@ -610,7 +610,7 @@ CreateSolidPicture (Picture pid,
xRenderColor *color,
int *error);
-extern _X_EXPORT PicturePtr
+extern PicturePtr
CreateLinearGradientPicture (Picture pid,
xPointFixed *p1,
xPointFixed *p2,
@@ -619,7 +619,7 @@ CreateLinearGradientPicture (Picture pid,
xRenderColor *colors,
int *error);
-extern _X_EXPORT PicturePtr
+extern PicturePtr
CreateRadialGradientPicture (Picture pid,
xPointFixed *inner,
xPointFixed *outer,
@@ -630,7 +630,7 @@ CreateRadialGradientPicture (Picture pid,
xRenderColor *colors,
int *error);
-extern _X_EXPORT PicturePtr
+extern PicturePtr
CreateConicalGradientPicture (Picture pid,
xPointFixed *center,
xFixed angle,
@@ -640,19 +640,19 @@ CreateConicalGradientPicture (Picture pid,
int *error);
#ifdef PANORAMIX
-extern _X_EXPORT void PanoramiXRenderInit (void);
-extern _X_EXPORT void PanoramiXRenderReset (void);
+extern void PanoramiXRenderInit (void);
+extern void PanoramiXRenderReset (void);
#endif
/*
* matrix.c
*/
-extern _X_EXPORT void
+extern void
PictTransform_from_xRenderTransform (PictTransformPtr pict,
xRenderTransform *render);
-extern _X_EXPORT void
+extern void
xRenderTransform_from_PictTransform (xRenderTransform *render,
PictTransformPtr pict);
@@ -660,7 +660,7 @@ extern _X_EXPORT Bool
PictureTransformPoint (PictTransformPtr transform,
PictVectorPtr vector);
-extern _X_EXPORT Bool
+extern Bool
PictureTransformPoint3d (PictTransformPtr transform,
PictVectorPtr vector);
--
1.7.7.3
More information about the xorg-devel
mailing list