next try

24 years ago · 36bb22c7b7
parent 16019eb8b0
commit 36bb22c7b7
3 changed files with 6 additions and 4 deletions
--- a/include/freetype/config/ft2build.h
+++ b/include/freetype/config/ft2build.h
@ -70,7 +70,8 @@
  /* installed on the particular system.                                   */
  /*                                                                       */
 #ifndef FT2_CONFIG_ROOT
-#define FT2_CONFIG_ROOT  FT2_ROOT ## / ## config
+#define FT2_CONFIG_ROOT_( x )  x ## / ## config
+#define FT2_CONFIG_ROOT        FT2_CONFIG_ROOT_(FT2_ROOT)
 #endif


@ -208,7 +209,8 @@


  /* now include internal headers definitions from <freetype/internal/...> */
-#include FT2_INTERNAL_FILE(internal.h)
+#define FT2_INTERNAL_H  FT2_INTERNAL_FILE(internal.h)
+#include FT2_INTERNAL_H


 #endif /* __FT2_BUILD_H__ */
--- a/src/autohint/ahoptim.c
+++ b/src/autohint/ahoptim.c
@ -48,7 +48,7 @@
 #undef LOG
 #ifdef AH_DEBUG_OPTIM

-#define LOG( x )  optim_log##x
+#define LOG( x )  optim_log ## x

 #else

--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@ -35,7 +35,7 @@
 #ifdef AH_DEBUG

 #include <stdio.h>
-#define AH_LOG( x )  printf##x
+#define AH_LOG( x )  printf ## x

 #else