ref: f223df6e79512ee01a4caa4f096f678532016981
parent: beebb33202aa340f3ffabf91aa0d0f875cc26de0
author: Suzuki, Toshiya (鈴木俊哉) <[email protected]>
date: Sun Feb 4 23:07:46 EST 2007
* Add __attribute__((deprecated)) to functions whose interface using non ANSI data types
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2007-02-05 suzuki toshiya <[email protected]>
+ * include/freetype/ftmac.h (FT_DEPRECATED_ATTRIBUTE):
+ Introduce __attribute((deprecated))__ to warn functions
+ which use non ANSI data types in their interfaces.
+ (FT_GetFile_From_Mac_Name): Deprecated, using FSSpec.
+ (FT_GetFile_From_Mac_ATS_Name): Deprecated, using FSSpec.
+ (FT_New_Face_From_FSSpec): Deprecated, using FSSpec.
+ (FT_New_Face_From_FSRef): Deprecated, using FSRef.
+ * src/base/ftmac.c: predefine FT_DEPRECATED_ATTRIBUTE as blank
+ to avoid warning in building freetype.
+ * builds/mac/ftmac.c: Ditto.
+
+2007-02-05 suzuki toshiya <[email protected]>
+
* src/base/ftbase.c: Fix to use builds/mac/ftmac.c, if configured
"--with-fsspec" etc. Replace #include "ftmac.c" by
#include <ftmac.c>.
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -88,6 +88,8 @@
#include <FSp_fopen.h>
#endif
+#define FT_DEPRECATED_ATTRIBUTE
+
#include FT_MAC_H
#undef FT_GetFile_From_Mac_Name
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -35,6 +35,16 @@
FT_BEGIN_HEADER
+/* gcc-3.4.1 and later can warn the functions attributed as deprecated */
+#ifndef FT_DEPRECATED_ATTRIBUTE
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
+#define FT_DEPRECATED_ATTRIBUTE __attribute__((deprecated))
+#else
+#define FT_DEPRECATED_ATTRIBUTE
+#endif
+#endif
+
+
/*************************************************************************/
/* */
/* <Section> */
@@ -117,7 +127,8 @@
FT_EXPORT( FT_Error )
FT_GetFile_From_Mac_Name( const char* fontName,
FSSpec* pathSpec,
- FT_Long* face_index );
+ FT_Long* face_index )
+ FT_DEPRECATED_ATTRIBUTE;
/*************************************************************************/
@@ -144,7 +155,8 @@
FT_EXPORT( FT_Error )
FT_GetFile_From_Mac_ATS_Name( const char* fontName,
FSSpec* pathSpec,
- FT_Long* face_index );
+ FT_Long* face_index )
+ FT_DEPRECATED_ATTRIBUTE;
/*************************************************************************/
@@ -209,7 +221,8 @@
FT_New_Face_From_FSSpec( FT_Library library,
const FSSpec *spec,
FT_Long face_index,
- FT_Face *aface );
+ FT_Face *aface )
+ FT_DEPRECATED_ATTRIBUTE;
/*************************************************************************/
@@ -243,7 +256,8 @@
FT_New_Face_From_FSRef( FT_Library library,
const FSRef *ref,
FT_Long face_index,
- FT_Face *aface );
+ FT_Face *aface )
+ FT_DEPRECATED_ATTRIBUTE;
/* */
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -82,6 +82,7 @@
#define HFS_MAXPATHLEN 1024
#endif
+#define FT_DEPRECATED_ATTRIBUTE
#include FT_MAC_H