* 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.
This commit is contained in:
Werner Lemberg 2000-12-12 06:36:55 +00:00
parent 90d9964ec9
commit 6d5d719d9e
4 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,13 @@
2000-12-11 Werner Lemberg <wl@gnu.org>
* 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 <wl@gnu.org>
* builds/unix/detect.mk: Remove unused USE_CFLAGS variable.
2000-12-08 Werner Lemberg <wl@gnu.org> 2000-12-08 Werner Lemberg <wl@gnu.org>
* */*.h: Changed body inclusion macro names to start and end with * */*.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/winfonts/winfnt.c: Updated to new header inclusion scheme.
* src/truetype/ttinterp.c: Remove unused CALC_Length() macro.
2000-12-07 David Turner <david.turner@freetype.org> 2000-12-07 David Turner <david.turner@freetype.org>
* */*.[ch]: Changed source files to adhere to the new * */*.[ch]: Changed source files to adhere to the new

View File

@ -63,7 +63,7 @@ ifeq ($(PLATFORM),ansi)
setup: std_setup setup: std_setup
unix-def.mk: $(TOP)/builds/unix/unix-def.in 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 Unix
endif # test PLATFORM endif # test PLATFORM

View File

@ -70,7 +70,7 @@
/* installed on the particular system. */ /* installed on the particular system. */
/* */ /* */
#ifndef FT2_CONFIG_ROOT #ifndef FT2_CONFIG_ROOT
#define FT2_CONFIG_ROOT FT2_ROOT/config #define FT2_CONFIG_ROOT FT2_ROOT ## / ## config
#endif #endif
@ -80,7 +80,7 @@
/* Its parameter is the file pathname, relative to the public root of a */ /* Its parameter is the file pathname, relative to the public root of a */
/* given header file. */ /* given header file. */
/* */ /* */
#define FT2_PUBLIC_FILE( x ) <FT2_ROOT/x> #define FT2_PUBLIC_FILE( x ) < ## FT2_ROOT ## / ## x ## >
/*************************************************************************/ /*************************************************************************/
@ -89,7 +89,7 @@
/* Its parameter is the file pathname, relative to the configuration */ /* Its parameter is the file pathname, relative to the configuration */
/* root directory of a given header file. */ /* 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 ## >
/*************************************************************************/ /*************************************************************************/
@ -98,7 +98,7 @@
/* file. Its parameter is the file pathname, relative to the */ /* file. Its parameter is the file pathname, relative to the */
/* configuration root directory of a given header file. */ /* 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 ## >
/*************************************************************************/ /*************************************************************************/
@ -118,7 +118,7 @@
#ifdef FT_FLAT_COMPILATION #ifdef FT_FLAT_COMPILATION
#define FT_SOURCE_FILE( d, x ) #x #define FT_SOURCE_FILE( d, x ) #x
#else #else
#define FT_SOURCE_FILE( d, x ) <d/x> #define FT_SOURCE_FILE( d, x ) < ## d ## / ## x ## >
#endif #endif

View File

@ -191,9 +191,6 @@
#define CUR_Ppem() \ #define CUR_Ppem() \
Cur_PPEM( EXEC_ARG ) Cur_PPEM( EXEC_ARG )
#define CALC_Length() \
Calc_Length( EXEC_ARG )
#define INS_SxVTL( a, b, c, d ) \ #define INS_SxVTL( a, b, c, d ) \
Ins_SxVTL( EXEC_ARG_ a, b, c, d ) Ins_SxVTL( EXEC_ARG_ a, b, c, d )