From 16a60e872f069801813bc751273a85060af0ae2e Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 12 Dec 2000 16:29:46 +0000
Subject: [PATCH] next try

---
 include/freetype/config/ft2build.h | 6 ++++--
 src/autohint/ahoptim.c             | 2 +-
 src/autohint/ahtypes.h             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
index 42b8ea975..3e5056336 100644
--- 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__ */
diff --git a/src/autohint/ahoptim.c b/src/autohint/ahoptim.c
index f10d3a6a1..910d635d5 100644
--- 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
 
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 65976658c..8e47379d2 100644
--- 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