include/freetype/internal/internal.h: Fixed header inclusion macros
to use direct definitions. This is the only way to do these things
in a portable way :-( The rest of the code should follow shortly
though everything compiles now.
* builds/compiler/intelc.mk, builds/compiler/watcom.mk: New files.
* builds/win32/detect.mk: Added support for the Intel C/C++
compiler, as well as _preliminary_ (read: doesn't work!) support for
Watcom. Also added a new setup target. Type "make setup list" for
a list of supported command-line compilers on Win32.
* src/base/ftdebug.c: Added dummy symbol to avoid empty file if
conditionals are off.
diff --git a/ChangeLog b/ChangeLog
index f8eb4b0..f7afdb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,20 @@
2000-12-13 David Turner <david.turner@freetype.org>
* include/freetype/config/ft2build.h,
- include/freetype/internal/internal.h: fixed header inclusion macros
- to use direct definitions. This is the only way to do these things
- in a portable way :-( The rest of the code should follow shortly
- though everything compiles now..
+ include/freetype/internal/internal.h: Fixed header inclusion macros
+ to use direct definitions. This is the only way to do these things
+ in a portable way :-( The rest of the code should follow shortly
+ though everything compiles now.
- * builds/compiler/intelc.mk, builds/compiler/watcom.mk,
- builds/win32/detect.mk: added support for the Intel C/C++ compiler,
- as well as _preliminary_ (read: doesn't work !!) support for Watcom.
- Also added a new setup target. Type "make setup list" for a list
- of supported command-line compilers on Win32..
+ * builds/compiler/intelc.mk, builds/compiler/watcom.mk: New files.
+
+ * builds/win32/detect.mk: Added support for the Intel C/C++
+ compiler, as well as _preliminary_ (read: doesn't work!) support for
+ Watcom. Also added a new setup target. Type "make setup list" for
+ a list of supported command-line compilers on Win32.
+
+ * src/base/ftdebug.c: Added dummy symbol to avoid empty file if
+ conditionals are off.
2000-12-13 Werner Lemberg <wl@gnu.org>
diff --git a/builds/compiler/intelc.mk b/builds/compiler/intelc.mk
index 0b64f91..0c3088a 100644
--- a/builds/compiler/intelc.mk
+++ b/builds/compiler/intelc.mk
@@ -63,10 +63,10 @@
# ANSI compliance.
#
# Note that the Intel C/C++ compiler version 4.5 complains about
-# the use of FT_FIELD_OFFSET with "value must be arithmetic type !!"
-# this really looks like a bug in the compiler because the macro
+# the use of FT_FIELD_OFFSET with "value must be arithmetic type"!
+# This really looks like a bug in the compiler because the macro
# _does_ compute an arithmetic value, so we disable this warning
-# with "/Qwd32" !!
+# with "/Qwd32".
#
ifndef CFLAGS
CFLAGS := /nologo /c /Ox /G5 /W3 /Qwd32
diff --git a/builds/compiler/visualc.mk b/builds/compiler/visualc.mk
index 432f7af..235a4df 100644
--- a/builds/compiler/visualc.mk
+++ b/builds/compiler/visualc.mk
@@ -70,6 +70,7 @@
#
ANSIFLAGS := /Za
+
# Library linking
#
#CLEAN_LIBRARY =
diff --git a/builds/compiler/watcom.mk b/builds/compiler/watcom.mk
index aae26dd..e1e2d11 100644
--- a/builds/compiler/watcom.mk
+++ b/builds/compiler/watcom.mk
@@ -17,12 +17,14 @@
#
CC := wcc386
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
+
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 228ac29..055de02 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -27,11 +27,11 @@
is_windows := 1
endif
- # We test for the COMSPEC environment variable, then run the `ver'
- # command-line program to see if its output contains the word `Windows'.
- #
- # If this is true, we are running a win32 platform (or an emulation).
- #
+ # We test for the COMSPEC environment variable, then run the `ver'
+ # command-line program to see if its output contains the word `Windows'.
+ #
+ # If this is true, we are running a win32 platform (or an emulation).
+ #
else
ifneq ($(OSTYPE),cygwin)
ifdef COMSPEC
@@ -42,29 +42,29 @@
ifdef is_windows
- PLATFORM := win32
- DELETE := del
- COPY := copy
- CONFIG_FILE := none
+ PLATFORM := win32
+ DELETE := del
+ COPY := copy
+ CONFIG_FILE := none
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
.PHONY: dump_target_list setup list
dump_target_list:
- @echo ÿ
- @echo $(PROJECT_TITLE) build system -- supported compilers
- @echo ÿ
- @echo Several command-line compilers are supported on Win32:
- @echo ÿ
- @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
- @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
- @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
- @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
- @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
- @echo ÿ
+ @echo ÿ
+ @echo $(PROJECT_TITLE) build system -- supported compilers
+ @echo ÿ
+ @echo Several command-line compilers are supported on Win32:
+ @echo ÿ
+ @echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
+ @echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
+ @echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
+ @echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
+ @echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
+ @echo ÿ
- setup: dump_target_list
+ setup: dump_target_list
else # test "list"
@@ -104,9 +104,10 @@
CC := icl
intelc: setup
endif
-#
-# The following build targets are not officialy supported for now
-#
+
+ #
+ # The following build targets are not officially supported for now
+ #
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := w32-icc.mk
diff --git a/builds/win32/w32-intl.mk b/builds/win32/w32-intl.mk
index 1b2b4e9..6ae022f 100644
--- a/builds/win32/w32-intl.mk
+++ b/builds/win32/w32-intl.mk
@@ -1,5 +1,5 @@
#
-# FreeType 2 Intel C/C++ on Win32
+# FreeType 2 configuration rules for Intel C/C++ on Win32
#
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h
index 145c8bc..f5ed7eb 100644
--- a/include/freetype/cache/ftcchunk.h
+++ b/include/freetype/cache/ftcchunk.h
@@ -55,7 +55,7 @@
/* maximum number of chunk sets in a given chunk cache */
-#define FTC_MAX_CHUNK_SETS 16
+#define FTC_MAX_CHUNK_SETS 16
typedef struct FTC_ChunkNodeRec_* FTC_ChunkNode;
diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h
index e8a25bb..58ed204 100644
--- a/include/freetype/cache/ftcimage.h
+++ b/include/freetype/cache/ftcimage.h
@@ -46,25 +46,25 @@
/*************************************************************************/
-#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
+#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
-#define ftc_image_format_bitmap 0
-#define ftc_image_format_outline 1
+#define ftc_image_format_bitmap 0
+#define ftc_image_format_outline 1
-#define ftc_image_flag_monochrome 16
-#define ftc_image_flag_unhinted 32
-#define ftc_image_flag_autohinted 64
-#define ftc_image_flag_unscaled 128
-#define ftc_image_flag_no_sbits 256
+#define ftc_image_flag_monochrome 16
+#define ftc_image_flag_unhinted 32
+#define ftc_image_flag_autohinted 64
+#define ftc_image_flag_unscaled 128
+#define ftc_image_flag_no_sbits 256
/* monochrome bitmap */
-#define ftc_image_mono ftc_image_format_bitmap | \
+#define ftc_image_mono ftc_image_format_bitmap | \
ftc_image_flag_monochrome
/* anti-aliased bitmap */
-#define ftc_image_grays ftc_image_format_bitmap
+#define ftc_image_grays ftc_image_format_bitmap
/* scaled outline */
-#define ftc_image_outline ftc_image_format_outline
+#define ftc_image_outline ftc_image_format_outline
/*************************************************************************/
diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
index 093aa2e..13603f0 100644
--- a/include/freetype/config/ft2build.h
+++ b/include/freetype/config/ft2build.h
@@ -47,13 +47,13 @@
/* this macro is used to enclose its argument in brackets */
-#define FT2_ENCLOSE(x) <x>
+#define FT2_ENCLOSE(x) <x>
/* this macro is used to join a path and a file name */
-#define FT2_JOINPATH(d,x) d/x
+#define FT2_JOINPATH(d,x) d/x
/* this macro is used to format a path in "<d/x>" format easily */
-#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
+#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index efac5ee..0fcca41 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -42,13 +42,13 @@
FT_BEGIN_HEADER
-#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
-#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
-#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
+#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
+#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
+#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
-#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
-#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
-#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
+#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
+#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
+#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
/*************************************************************************/
diff --git a/include/freetype/internal/cfftypes.h b/include/freetype/internal/cfftypes.h
index c2a3d85..ff8d375 100644
--- a/include/freetype/internal/cfftypes.h
+++ b/include/freetype/internal/cfftypes.h
@@ -20,8 +20,10 @@
#ifndef __CFFTYPES_H__
#define __CFFTYPES_H__
-#include <ft2build.h>
-#include FT_FREETYPE_H
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/fnttypes.h b/include/freetype/internal/fnttypes.h
index 080770d..446b4b1 100644
--- a/include/freetype/internal/fnttypes.h
+++ b/include/freetype/internal/fnttypes.h
@@ -67,8 +67,8 @@
} WinResourceInfo;
-#define WINFNT_MZ_MAGIC 0x5A4D
-#define WINFNT_NE_MAGIC 0x454E
+#define WINFNT_MZ_MAGIC 0x5A4D
+#define WINFNT_NE_MAGIC 0x454E
typedef struct WinFNT_Header_
diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c
index 7187852..812b021 100644
--- a/src/autohint/ahangles.c
+++ b/src/autohint/ahangles.c
@@ -20,8 +20,8 @@
/***************************************************************************/
-#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahangles.h)
+#include <ft2build.h>
+#include FT_SOURCE_FILE(autohint,ahangles.h)
/* the following table has been automatically generated with */
diff --git a/src/autohint/ahmodule.h b/src/autohint/ahmodule.h
index ce8daa1..f6643d2 100644
--- a/src/autohint/ahmodule.h
+++ b/src/autohint/ahmodule.h
@@ -23,8 +23,8 @@
#define __AHMODULE_H__
-#include <ft2build.h>
-#include FT_MODULE_H
+#include <ft2build.h>
+#include FT_MODULE_H
FT_BEGIN_HEADER
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index f954987..f2a2237 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -107,7 +107,9 @@
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
- /* needed by pedantic ANSI compilers */
+
+ /* ANSI C doesn't allow empty files, so we insert a dummy symbol */
extern const int ft_debug_dummy;
+
/* END */
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index de73815..adb295b 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -26,7 +26,7 @@
#include <string.h> /* memcmp() */
-#define FTC_SBITSET_ELEMENT_COUNT 16
+#define FTC_SBITSET_ELEMENT_COUNT 16
typedef struct FTC_SBitSetRec_
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 06875c8..bbde59a 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -442,7 +442,7 @@
static const CFF_Field_Handler cff_field_handlers[] =
{
-#include FT_SOURCE_FILE(cff,cfftoken.h)
+#include FT_SOURCE_FILE(cff,cfftoken.h)
{ 0, 0, 0, 0, 0, 0, 0 }
};
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 7dceb0e..a105320 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -31,8 +31,8 @@
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
/* messages during execution. */
/* */
-#undef FT_COMPONENT
-#define FT_COMPONENT trace_cidobjs
+#undef FT_COMPONENT
+#define FT_COMPONENT trace_cidobjs
/*************************************************************************/
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index d605ac8..91fce49 100644
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -18,18 +18,18 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <ft2build.h>
-#include FT_SOURCE_FILE(sfnt,ttload.c)
-#include FT_SOURCE_FILE(sfnt,ttcmap.c)
-#include FT_SOURCE_FILE(sfnt,sfobjs.c)
-#include FT_SOURCE_FILE(sfnt,sfdriver.c)
+#include <ft2build.h>
+#include FT_SOURCE_FILE(sfnt,ttload.c)
+#include FT_SOURCE_FILE(sfnt,ttcmap.c)
+#include FT_SOURCE_FILE(sfnt,sfobjs.c)
+#include FT_SOURCE_FILE(sfnt,sfdriver.c)
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#include FT_SOURCE_FILE(sfnt,ttsbit.c)
+#include FT_SOURCE_FILE(sfnt,ttsbit.c)
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#include FT_SOURCE_FILE(sfnt,ttpost.c)
+#include FT_SOURCE_FILE(sfnt,ttpost.c)
#endif
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index c2ee53e..5fcf066 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -61,7 +61,7 @@
/* table of Mac names. Thus, it is possible to build a version of */
/* FreeType without the Type 1 driver & PSNames module. */
-#define MAC_NAME( x ) TT_Post_Default_Names[x]
+#define MAC_NAME( x ) TT_Post_Default_Names[x]
/* the 258 default Mac PS glyph names */
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index ca863b7..0a9c849 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -122,11 +122,11 @@
#else /* _STANDALONE_ */
-#include <ft2build.h>
-#include FT_SOURCE_FILE(smooth,ftgrays.h)
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_DEBUG_H
-#include FT_OUTLINE_H
+#include <ft2build.h>
+#include FT_SOURCE_FILE(smooth,ftgrays.h)
+#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
+#include FT_OUTLINE_H
#define ErrRaster_Invalid_Mode FT_Err_Cannot_Render_Glyph
#define ErrRaster_Invalid_Outline FT_Err_Invalid_Outline
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index f60b55c..d73cf94 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -6841,8 +6841,8 @@
FT_Byte opcode = CUR.opcode;
-#undef ARRAY_BOUND_ERROR
-#define ARRAY_BOUND_ERROR goto Set_Invalid_Ref
+#undef ARRAY_BOUND_ERROR
+#define ARRAY_BOUND_ERROR goto Set_Invalid_Ref
switch ( opcode )