From 6d5d719d9eb29ea0bfaacc5bef989832fdfe4ccb Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 12 Dec 2000 06:36:55 +0000 Subject: [PATCH] * include/freetype/config/build.h (FT2_CONFIG_ROOT, FT2_PUBLIC_FILE, FT2_CONFIG_FILE, FT2_INTERNAL_FILE, FT_SOURCE_FILE): Use `##' operator to be really ANSI C compliant. * builds/unix/detect.mk: Remove unused USE_CFLAGS variable. * src/truetype/ttinterp.c: Remove unused CALC_Length() macro. --- ChangeLog | 12 ++++++++++++ builds/unix/detect.mk | 2 +- include/freetype/config/ft2build.h | 10 +++++----- src/truetype/ttinterp.c | 3 --- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f42846477..7b3077e74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-12-11 Werner Lemberg + + * include/freetype/config/build.h (FT2_CONFIG_ROOT, FT2_PUBLIC_FILE, + FT2_CONFIG_FILE, FT2_INTERNAL_FILE, FT_SOURCE_FILE): Use `##' + operator to be really ANSI C compliant. + +2000-12-09 Werner Lemberg + + * builds/unix/detect.mk: Remove unused USE_CFLAGS variable. + 2000-12-08 Werner Lemberg * */*.h: Changed body inclusion macro names to start and end with @@ -6,6 +16,8 @@ * src/winfonts/winfnt.c: Updated to new header inclusion scheme. + * src/truetype/ttinterp.c: Remove unused CALC_Length() macro. + 2000-12-07 David Turner * */*.[ch]: Changed source files to adhere to the new diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index cbdefd5ad..5c85bb4b2 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -63,7 +63,7 @@ ifeq ($(PLATFORM),ansi) setup: std_setup unix-def.mk: $(TOP)/builds/unix/unix-def.in - cd builds/unix; $(USE_CFLAGS) ./configure $(CFG) + cd builds/unix; ./configure $(CFG) endif # test Unix endif # test PLATFORM diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h index 946e7e358..dd9b268fe 100644 --- a/include/freetype/config/ft2build.h +++ b/include/freetype/config/ft2build.h @@ -70,7 +70,7 @@ /* installed on the particular system. */ /* */ #ifndef FT2_CONFIG_ROOT -#define FT2_CONFIG_ROOT FT2_ROOT/config +#define FT2_CONFIG_ROOT FT2_ROOT ## / ## config #endif @@ -80,7 +80,7 @@ /* Its parameter is the file pathname, relative to the public root of a */ /* given header file. */ /* */ -#define FT2_PUBLIC_FILE( x ) +#define FT2_PUBLIC_FILE( x ) < ## FT2_ROOT ## / ## x ## > /*************************************************************************/ @@ -89,7 +89,7 @@ /* Its parameter is the file pathname, relative to the configuration */ /* root directory of a given header file. */ /* */ -#define FT2_CONFIG_FILE( x ) +#define FT2_CONFIG_FILE( x ) < ## FT2_CONFIG_ROOT ## / ## x ## > /*************************************************************************/ @@ -98,7 +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 ) +#define FT2_INTERNAL_FILE( x ) < ## FT2_ROOT ## / ## internal ## / ## x ## > /*************************************************************************/ @@ -118,7 +118,7 @@ #ifdef FT_FLAT_COMPILATION #define FT_SOURCE_FILE( d, x ) #x #else -#define FT_SOURCE_FILE( d, x ) +#define FT_SOURCE_FILE( d, x ) < ## d ## / ## x ## > #endif diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 22fe60366..f60b55cce 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -191,9 +191,6 @@ #define CUR_Ppem() \ Cur_PPEM( EXEC_ARG ) -#define CALC_Length() \ - Calc_Length( EXEC_ARG ) - #define INS_SxVTL( a, b, c, d ) \ Ins_SxVTL( EXEC_ARG_ a, b, c, d )