ref: ada9503d2223cdc2c700e83d0fe92f5a1d21d652
parent: f1ca234473bcae8c1c09e5ed1aaa8a6ae403d3d3
author: Werner Lemberg <[email protected]>
date: Wed Nov 29 12:48:57 EST 2000
* src/base/ftcalc.c (FT_SqrtFixed), src/base/ftobjs.c (FT_Set_Renderer): Use FT_EXPORT_DEF. * src/cache/ftcimage.c (FTC_Image_Cache_Lookup), src/cache/ftcmanag.c (FTC_Manager_Done, FTC_Manager_Reset, FTC_Manager_Lookup_Face, FTC_Manager_Lookup_Size, FTC_Manager_Register_Cache), src/cache/ftcsbits.c (FTC_SBit_Cache_Lookup): Ditto. * src/include/freetype/cache/ftcglyph.h (FTC_GlyphNode_Init), src/include/freetype/ftmac.h (FT_New_Face_From_FOND): Use FT_EXPORT.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2000-11-29 Werner Lemberg <[email protected]>
+ * src/base/ftcalc.c (FT_SqrtFixed), src/base/ftobjs.c
+ (FT_Set_Renderer): Use FT_EXPORT_DEF.
+ * src/cache/ftcimage.c (FTC_Image_Cache_Lookup),
+ src/cache/ftcmanag.c (FTC_Manager_Done, FTC_Manager_Reset,
+ FTC_Manager_Lookup_Face, FTC_Manager_Lookup_Size,
+ FTC_Manager_Register_Cache), src/cache/ftcsbits.c
+ (FTC_SBit_Cache_Lookup): Ditto.
+
+ * src/include/freetype/cache/ftcglyph.h (FTC_GlyphNode_Init),
+ src/include/freetype/ftmac.h (FT_New_Face_From_FOND): Use FT_EXPORT.
+
+2000-11-29 Werner Lemberg <[email protected]>
+
* src/sfnt/sfdriver.c: Include ttsbit.h and ttpost.h only
conditionally.
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -167,9 +167,9 @@
/* cache sub-system internals. */
/* */
- FT_EXPORT_DEF( void ) FTC_GlyphNode_Init( FTC_GlyphNode node,
- FTC_GlyphSet gset,
- FT_UInt gindex );
+ FT_EXPORT( void ) FTC_GlyphNode_Init( FTC_GlyphNode node,
+ FTC_GlyphSet gset,
+ FT_UInt gindex );
#define FTC_GlyphNode_Ref( n ) \
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -64,11 +64,10 @@
/* fond = GetResource( 'FOND', fontName ); */
/* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */
/* */
- FT_EXPORT_DEF( FT_Error ) FT_New_Face_From_FOND(
- FT_Library library,
- Handle fond,
- FT_Long face_index,
- FT_Face *aface );
+ FT_EXPORT( FT_Error ) FT_New_Face_From_FOND( FT_Library library,
+ Handle fond,
+ FT_Long face_index,
+ FT_Face *aface );
#ifdef __cplusplus
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -200,9 +200,8 @@
}
- FT_EXPORT( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
+ FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
{-
FT_Int64 z;
@@ -523,7 +522,7 @@
}
- FT_EXPORT( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
+ FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
{FT_Int64 z;
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2034,10 +2034,10 @@
/* documentation is in ftrender.h */
- FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library,
- FT_Renderer renderer,
- FT_UInt num_params,
- FT_Parameter* parameters )
+ FT_EXPORT_DEF( FT_Error ) FT_Set_Renderer( FT_Library library,
+ FT_Renderer renderer,
+ FT_UInt num_params,
+ FT_Parameter* parameters )
{FT_ListNode node;
FT_Error error = FT_Err_Ok;
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -271,10 +271,10 @@
}
- FT_EXPORT( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache,
- FTC_Image_Desc* desc,
- FT_UInt gindex,
- FT_Glyph *aglyph )
+ FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache,
+ FTC_Image_Desc* desc,
+ FT_UInt gindex,
+ FT_Glyph *aglyph )
{FT_Error error;
FTC_GlyphNode node;
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -273,7 +273,7 @@
}
- FT_EXPORT( void ) FTC_Manager_Done( FTC_Manager manager )
+ FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager )
{FT_Memory memory;
FT_UInt index;
@@ -306,7 +306,7 @@
}
- FT_EXPORT( void ) FTC_Manager_Reset( FTC_Manager manager )
+ FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager )
{if (manager )
{@@ -317,9 +317,9 @@
}
- FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager,
- FTC_FaceID face_id,
- FT_Face *aface )
+ FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager,
+ FTC_FaceID face_id,
+ FT_Face *aface )
{if ( !manager )
return FT_Err_Invalid_Cache_Handle;
@@ -330,10 +330,10 @@
}
- FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
- FTC_Font font,
- FT_Face *aface,
- FT_Size *asize )
+ FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
+ FTC_Font font,
+ FT_Face *aface,
+ FT_Size *asize )
{FTC_FontRequest req;
FT_Error error;
@@ -425,10 +425,10 @@
}
- FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache(
- FTC_Manager manager,
- FTC_Cache_Class* clazz,
- FTC_Cache *acache )
+ FT_EXPORT_DEF( FT_Error ) FTC_Manager_Register_Cache(
+ FTC_Manager manager,
+ FTC_Cache_Class* clazz,
+ FTC_Cache *acache )
{FT_Error error = FT_Err_Invalid_Argument;
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -364,10 +364,10 @@
}
- FT_EXPORT( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache,
- FTC_Image_Desc* desc,
- FT_UInt gindex,
- FTC_SBit *ansbit )
+ FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache,
+ FTC_Image_Desc* desc,
+ FT_UInt gindex,
+ FTC_SBit *ansbit )
{FT_Error error;
FTC_ChunkNode node;