Commit c4c35b773dbeb444bf2848619defce03660b0e4b
2006-08-27T08:03:46
* builds/unix/ftconfig.in: Synchronize with main ftconfig.h. Reported by Jens. Formatting.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/ChangeLog b/ChangeLog
index f17623f..cc74a78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2006-08-27 Werner Lemberg <wl@gnu.org>
+
+ * builds/unix/ftconfig.in: Synchronize with main ftconfig.h.
+ Reported by Jens.
+
2006-08-22 Jens Claudius <jens.claudius@yahoo.com>
- Fix for previous commit, which caused many compiler warnings/errors
- about addresses of volatile objects passed as function arguments
- as non-volatile pointers.
+ Fix for previous commit, which caused many compiler warnings/errors
+ about addresses of volatile objects passed as function arguments as
+ non-volatile pointers.
- * freetype2/include/freetype/internal/ftvalid.h: Make
- FT_Validator typedef a pointer to a volatile object.
+ * freetype2/include/freetype/internal/ftvalid.h: Make FT_Validator
+ typedef a pointer to a volatile object.
* freetype2/src/gxvalid/gxvmod.c (gxv_load_table): Make function
argument `table' a pointer to a volatile object.
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index 6d8f1e8..8e379a8 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -4,7 +4,7 @@
/* */
/* UNIX-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -176,7 +176,7 @@ FT_BEGIN_HEADER
#elif defined( __GNUC__ )
- /* GCC provides the "long long" type */
+ /* GCC provides the `long long' type */
#define FT_LONG64
#define FT_INT64 long long int
@@ -243,9 +243,9 @@ FT_BEGIN_HEADER
#ifndef FT_BASE_DEF
#ifdef __cplusplus
-#define FT_BASE_DEF( x ) extern "C" x
+#define FT_BASE_DEF( x ) x
#else
-#define FT_BASE_DEF( x ) extern x
+#define FT_BASE_DEF( x ) x
#endif
#endif /* !FT_BASE_DEF */
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index 9014d8f..c1c2277 100644
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -39,10 +39,10 @@
static FT_Error
- otv_load_table( FT_Face face,
- FT_Tag tag,
- FT_Byte* volatile* table,
- FT_ULong* table_len )
+ otv_load_table( FT_Face face,
+ FT_Tag tag,
+ FT_Byte* volatile* table,
+ FT_ULong* table_len )
{
FT_Error error;
FT_Memory memory = FT_FACE_MEMORY( face );