summaryrefslogtreecommitdiff
path: root/render/glyph.c
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /render/glyph.c
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (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 'render/glyph.c')
-rw-r--r--render/glyph.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/render/glyph.c b/render/glyph.c
index 36d073f80..7c044aada 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -96,7 +96,7 @@ FreeGlyphPrivates (GlyphPtr glyph)
glyph->devPrivates = NULL;
}
-_X_EXPORT void
+void
GlyphUninit (ScreenPtr pScreen)
{
PictureScreenPtr ps = GetPictureScreen (pScreen);
@@ -129,7 +129,7 @@ GlyphUninit (ScreenPtr pScreen)
}
}
-_X_EXPORT GlyphHashSetPtr
+GlyphHashSetPtr
FindGlyphHashSet (CARD32 filled)
{
int i;
@@ -140,7 +140,7 @@ FindGlyphHashSet (CARD32 filled)
return 0;
}
-_X_EXPORT GlyphRefPtr
+GlyphRefPtr
FindGlyphRef (GlyphHashPtr hash,
CARD32 signature,
Bool match,
@@ -192,7 +192,7 @@ FindGlyphRef (GlyphHashPtr hash,
return gr;
}
-_X_EXPORT int
+int
HashGlyph (xGlyphInfo *gi,
CARD8 *bits,
unsigned long size,
@@ -229,7 +229,7 @@ HashGlyph (xGlyphInfo *gi,
return Success;
}
-_X_EXPORT GlyphPtr
+GlyphPtr
FindGlyphByHash (unsigned char sha1[20], int format)
{
GlyphRefPtr gr;
@@ -272,7 +272,7 @@ CheckDuplicates (GlyphHashPtr hash, char *where)
#define DuplicateRef(a,b)
#endif
-_X_EXPORT void
+void
FreeGlyph (GlyphPtr glyph, int format)
{
CheckDuplicates (&globalGlyphs[format], "FreeGlyph");
@@ -321,7 +321,7 @@ FreeGlyph (GlyphPtr glyph, int format)
}
}
-_X_EXPORT void
+void
AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
{
GlyphRefPtr gr;
@@ -366,7 +366,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
CheckDuplicates (&globalGlyphs[glyphSet->fdepth], "AddGlyph bottom");
}
-_X_EXPORT Bool
+Bool
DeleteGlyph (GlyphSetPtr glyphSet, Glyph id)
{
GlyphRefPtr gr;
@@ -384,7 +384,7 @@ DeleteGlyph (GlyphSetPtr glyphSet, Glyph id)
return FALSE;
}
-_X_EXPORT GlyphPtr
+GlyphPtr
FindGlyph (GlyphSetPtr glyphSet, Glyph id)
{
GlyphPtr glyph;
@@ -395,7 +395,7 @@ FindGlyph (GlyphSetPtr glyphSet, Glyph id)
return glyph;
}
-_X_EXPORT GlyphPtr
+GlyphPtr
AllocateGlyph (xGlyphInfo *gi, int fdepth)
{
PictureScreenPtr ps;
@@ -438,7 +438,7 @@ bail:
return 0;
}
-_X_EXPORT Bool
+Bool
AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet)
{
hash->table = xcalloc (hashSet->size, sizeof (GlyphRefRec));
@@ -449,7 +449,7 @@ AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet)
return TRUE;
}
-_X_EXPORT Bool
+Bool
ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
{
CARD32 tableEntries;
@@ -492,14 +492,14 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global)
return TRUE;
}
-_X_EXPORT Bool
+Bool
ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change)
{
return (ResizeGlyphHash (&glyphSet->hash, change, FALSE) &&
ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], change, TRUE));
}
-_X_EXPORT GlyphSetPtr
+GlyphSetPtr
AllocateGlyphSet (int fdepth, PictFormatPtr format)
{
GlyphSetPtr glyphSet;
@@ -527,7 +527,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format)
return glyphSet;
}
-_X_EXPORT int
+int
FreeGlyphSet (pointer value,
XID gid)
{
@@ -614,7 +614,7 @@ GlyphExtents (int nlist,
#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
-_X_EXPORT void
+void
CompositeGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,
@@ -632,20 +632,20 @@ CompositeGlyphs (CARD8 op,
(*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, lists, glyphs);
}
-_X_EXPORT Bool
+Bool
miRealizeGlyph (ScreenPtr pScreen,
GlyphPtr glyph)
{
return TRUE;
}
-_X_EXPORT void
+void
miUnrealizeGlyph (ScreenPtr pScreen,
GlyphPtr glyph)
{
}
-_X_EXPORT void
+void
miGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,