Re: [Devel] Feature request

[Werner LEMBERG]

> 
>       We have just updated to freetype 2.1.9 in our VTK internals. But the 
> building on Mac is producing warnings. We could fix those warnings in 
> our own VTK, but I just wanted to share with you the warnings produced:
> 
> http://www.vtk.org/Testing/Sites/krondor.kitware/Darwin-c++-carbon/20040817-0300-Nightly/BuildWarning.html

Thanks.  Please try the fix below (which includes your patch).  I
can't find a reason for still including `ttobjs.h' and `t1objs.h'.
Please test with your compiler and, if possible, with metrowerks also
so that I see the errors it causes.


    Werner


======================================================================


--- ftmac.c.old Wed Apr 14 08:39:30 2004
+++ ftmac.c     Tue Aug 17 16:42:24 2004
@@ -63,17 +63,13 @@
 #include FT_FREETYPE_H
 #include FT_INTERNAL_STREAM_H
 
-#ifdef __GNUC__
-#include "../truetype/ttobjs.h"
-#include "../type1/t1objs.h"
+#if defined( __GNUC__ ) || defined( __IBMC__ )
   /* This is for Mac OS X.  Without redefinition, OS_INLINE */
   /* expands to `static inline' which doesn't survive the   */
   /* -ansi compilation flag of GCC.                         */
 #define OS_INLINE  static __inline__
 #include <Carbon/Carbon.h>
 #else
-#include "truetype/ttobjs.h"
-#include "type1/t1objs.h"
 #include <Resources.h>
 #include <Fonts.h>
 #include <Errors.h>
@@ -1012,11 +1008,13 @@
                            FT_Long       face_index,
                            FT_Face      *aface )
   {
+#if defined( __MWERKS__ ) && !TARGET_RT_MAC_MACHO
     FT_Open_Args  args;
-    FT_Error      error;
     FT_Stream     stream;
     FILE*         file;
     FT_Memory     memory;
+#endif
+    FT_Error      error;
 
 
     /* test for valid `library' and `aface' delayed to FT_Open_Face() */