From f223df6e79512ee01a4caa4f096f678532016981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?=
 =?UTF-8?q?=E5=93=89=29?= <mpsuzuki@hiroshima-u.ac.jp>
Date: Mon, 5 Feb 2007 04:07:46 +0000
Subject: [PATCH] * Add __attribute__((deprecated)) to functions whose
 interface using non ANSI data types

---
 ChangeLog                | 13 +++++++++++++
 builds/mac/ftmac.c       |  2 ++
 include/freetype/ftmac.h | 22 ++++++++++++++++++----
 src/base/ftmac.c         |  1 +
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 415bc8ac6..146d97186 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-05  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* 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  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* src/base/ftbase.c: Fix to use builds/mac/ftmac.c, if configured
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index 484784cfa..3b89a234c 100644
--- 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
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index 4529fe2b3..fc4f6bca6 100644
--- 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_BEGIN_HEADER
   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_BEGIN_HEADER
   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_BEGIN_HEADER
   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_BEGIN_HEADER
   FT_New_Face_From_FSRef( FT_Library    library,
                           const FSRef  *ref,
                           FT_Long       face_index,
-                          FT_Face      *aface );
+                          FT_Face      *aface )
+                        FT_DEPRECATED_ATTRIBUTE;
 
   /* */
 
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index c8d06b001..82e05d45f 100644
--- 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