ref: 00004eef27d73ae5f00ed28fbd7ecd6604bbe227
parent: 91bb16583bb6554fb45243f016054ea576e07086
author: David Turner <[email protected]>
date: Tue Dec 5 17:28:15 EST 2000
fixed a broken inclusion of header files (a FT_FLAT_COMPILE test was missing !!)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-12-05 David Turner <[email protected]>
+ * src/psaux/psauxmod.c: fixed a broken inclusion of component
+ header files (a FT_FLAT_COMPILE test was missing)
+
* src/cache/ftcmanag.c (FTC_Manager_Done): fixed a bug that caused
an occasional crash when the function was called (due to a dangling
pointer)
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -16,9 +16,15 @@
/***************************************************************************/
-#include <psaux/psauxmod.h>
-#include <psaux/psobjs.h>
-#include <psaux/t1decode.h>
+#ifdef FT_FLAT_COMPILE
+# include "psauxmod.h"
+# include "psobjs.h"
+# include "t1decode.h"
+#else
+# include <psaux/psauxmod.h>
+# include <psaux/psobjs.h>
+# include <psaux/t1decode.h>
+#endif
FT_CALLBACK_TABLE_DEF
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -21,13 +21,9 @@
#include <freetype/internal/ftdebug.h>
#ifdef FT_FLAT_COMPILE
-
-#include "psobjs.h"
-
+# include "psobjs.h"
#else
-
-#include <psaux/psobjs.h>
-
+# include <psaux/psobjs.h>
#endif
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -23,15 +23,11 @@
#ifdef FT_FLAT_COMPILE
-
-#include "t1decode.h"
-#include "psobjs.h"
-
+# include "t1decode.h"
+# include "psobjs.h"
#else
-
-#include <psaux/t1decode.h>
-#include <psaux/psobjs.h>
-
+# include <psaux/t1decode.h>
+# include <psaux/psobjs.h>
#endif