Sync with trunk r47367

[reactos.git] / lib / 3rdparty / freetype / src / base / ftbase.c

diff --git a/lib/3rdparty/freetype/src/base/ftbase.c b/lib/3rdparty/freetype/src/base/ftbase.c
index d176b81..6a27ea9 100644 (file)
--- a/lib/3rdparty/freetype/src/base/ftbase.c
+++ b/lib/3rdparty/freetype/src/base/ftbase.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Single object library component (body only).                         */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007 by                   */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by       */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,19 +20,22 @@
 
 #define  FT_MAKE_OPTION_SINGLE_OBJECT
 
+#include "ftpic.c"
+#include "basepic.c"
+#include "ftadvanc.c"
 #include "ftcalc.c"
 #include "ftdbgmem.c"
 #include "ftgloadr.c"
-#include "ftnames.c"
 #include "ftobjs.c"
 #include "ftoutln.c"
 #include "ftrfork.c"
+#include "ftsnames.c"
 #include "ftstream.c"
 #include "fttrigon.c"
 #include "ftutil.c"
 
-#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
-#include <ftmac.c>
+#if defined( FT_MACINTOSH ) && !defined ( DARWIN_NO_CARBON )
+#include "ftmac.c"
 #endif
 
 /* END */