Commit ada9503d2223cdc2c700e83d0fe92f5a1d21d652
2000-11-29T17:48:57
* 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/ChangeLog b/ChangeLog
index d0e99df..a33f865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2000-11-29 Werner Lemberg <wl@gnu.org>
+ * 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 <wl@gnu.org>
+
* src/sfnt/sfdriver.c: Include ttsbit.h and ttpost.h only
conditionally.
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index b74afe0..b99748f 100644
--- 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++
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index 4b999e1..3e528e2 100644
--- 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
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 71da971..d42d602 100644
--- 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;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index c3cc8d4..636a765 100644
--- 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;
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 4f0e649..770338d 100644
--- 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;
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index f61ebc4..301aad0 100644
--- 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;
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index ef83046..fcb73fd 100644
--- 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;