Commit d96cd73f19bf6abf5c1adc5c34d9202b2a2587c1
2000-12-12T15:33:01
next try
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
diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
index 5eddcdb..1d6bc4d 100644
--- a/include/freetype/config/ft2build.h
+++ b/include/freetype/config/ft2build.h
@@ -80,8 +80,7 @@
/* Its parameter is the file pathname, relative to the public root of a */
/* given header file. */
/* */
-#define FT2_PUBLIC_FILE_( x ) < ## FT2_ROOT ## / ## x ## >
-#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_FILE_(x)
+#define FT2_PUBLIC_FILE( x ) < ## FT2_ROOT ## / ## x ## >
/*************************************************************************/
@@ -90,8 +89,7 @@
/* Its parameter is the file pathname, relative to the configuration */
/* root directory of a given header file. */
/* */
-#define FT2_CONFIG_FILE_( x ) < ## FT2_CONFIG_ROOT ## / ## x ## >
-#define FT2_CONFIG_FILE( x ) FT2_CONFIG_FILE_(x)
+#define FT2_CONFIG_FILE( x ) < ## FT2_CONFIG_ROOT ## / ## x ## >
/*************************************************************************/
@@ -100,8 +98,7 @@
/* file. Its parameter is the file pathname, relative to the */
/* configuration root directory of a given header file. */
/* */
-#define FT2_INTERNAL_FILE_( x ) < ## FT2_ROOT ## / ## internal ## / ## x ## >
-#define FT2_INTERNAL_FILE( x ) FT2_INTERNAL_FILE_(x)
+#define FT2_INTERNAL_FILE( x ) < ## FT2_ROOT ## / ## internal ## / ## x ## >
/*************************************************************************/
@@ -119,13 +116,11 @@
/* FT_FLAT_COMPILATION. */
/* */
#ifdef FT_FLAT_COMPILATION
-#define FT_SOURCE_FILE_( d, x ) #x
+#define FT_SOURCE_FILE( d, x ) #x
#else
-#define FT_SOURCE_FILE_( d, x ) < ## d ## / ## x ## >
+#define FT_SOURCE_FILE( d, x ) < ## d ## / ## x ## >
#endif
-#define FT_SOURCE_FILE( d, x ) FT_SOURCE_FILE_(d,x)
-
/*************************************************************************/
/* */
@@ -210,7 +205,8 @@
/* now include internal headers definitions from <freetype/internal/...> */
-#include FT2_PUBLIC_FILE(internal/internal.h)
+#define FT_INTERNAL_H FT2_INTERNAL_FILE(internal.h)
+#include FT_INTERNAL_H
#endif /* __FT2_BUILD_H__ */