Commit 00004eef27d73ae5f00ed28fbd7ecd6604bbe227
2000-12-05T22:28:15
fixed a broken inclusion of header files (a FT_FLAT_COMPILE test was missing !!)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/ChangeLog b/ChangeLog
index 704e533..01139f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-12-05 David Turner <david.turner@freetype.org>
+ * 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)
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index 6063f06..cad74a9 100644
--- 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
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 589cd68..9cfe8a4 100644
--- 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
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 40e4f4e..86a5bd0 100644
--- 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