From b052460a14a43e947388493cae5d6ddb82b5ee9e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 12 Dec 2000 07:35:12 +0000 Subject: [PATCH] another try --- include/freetype/config/ft2build.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h index dd9b268fe..5eddcdbeb 100644 --- a/include/freetype/config/ft2build.h +++ b/include/freetype/config/ft2build.h @@ -80,7 +80,8 @@ /* 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_ROOT ## / ## x ## > +#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_FILE_(x) /*************************************************************************/ @@ -89,7 +90,8 @@ /* 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_ROOT ## / ## x ## > +#define FT2_CONFIG_FILE( x ) FT2_CONFIG_FILE_(x) /*************************************************************************/ @@ -98,7 +100,8 @@ /* 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_ROOT ## / ## internal ## / ## x ## > +#define FT2_INTERNAL_FILE( x ) FT2_INTERNAL_FILE_(x) /*************************************************************************/ @@ -116,11 +119,13 @@ /* 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) + /*************************************************************************/ /* */