Commit 67ffd8cd19e1fc3bb48c8855061f4fe7a348c6d6
2002-04-18T14:26:29
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 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
diff --git a/ChangeLog b/ChangeLog
index 33da738..2b40323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,15 @@
2002-04-18 David Turner <david@freetype.org>
- * src/base/ftobjs.c, builds/win32/ftdebug.c,
- builds/amiga/src/base/ftdebug.c :
-
- 2.1.0 couldn't be linked against applications in Win32 and
- Amiga builds due to changes to "src/base/ftdebug.c" that
- were not properly propagated to "builds/win32" and
- "builds/amiga"..
-
- this has been fixed. We'll probably make 2.1.1 real
- soon now..
-
-
- * include/freetype/internal/ftobject.h,
- include/freetype/internal/ftexcept.h,
- include/freetype/ftsysmem.h,
- include/freetype/ftsysio.h,
- src/base/ftsysmem.c,
- src/base/ftsysio.c:
-
- adding new experimental files for 2.1.1 (or 2.1.2)
-
+ * src/base/ftobjs.c, builds/win32/ftdebug.c,
+ builds/amiga/src/base/ftdebug.c: Version 2.1.0 couldn't be linked
+ against applications in Win32 and Amiga builds due to changes to
+ "src/base/ftdebug.c" that were not properly propagated to
+ "builds/win32" and "builds/amiga". This has been fixed.
+
+ * include/freetype/internal/ftobject.h,
+ include/freetype/internal/ftexcept.h, include/freetype/ftsysmem.h,
+ include/freetype/ftsysio.h, src/base/ftsysmem.c, src/base/ftsysio.c:
+ New experimental files for.
2002-04-17 David Turner <david@freetype.org>
diff --git a/builds/amiga/src/base/ftdebug.c b/builds/amiga/src/base/ftdebug.c
index e9a29d7..7a04c1f 100644
--- a/builds/amiga/src/base/ftdebug.c
+++ b/builds/amiga/src/base/ftdebug.c
@@ -101,6 +101,7 @@ extern void __stdargs KVPrintF( const char *formatString, const void *values );
{
const char* ft2_debug = getenv( "FT2_DEBUG" );
+
if ( ft2_debug )
{
const char* p = ft2_debug;
@@ -167,14 +168,17 @@ extern void __stdargs KVPrintF( const char *formatString, const void *values );
}
}
+
#else /* !FT_DEBUG_LEVEL_TRACE */
+
FT_BASE_DEF( void )
ft_debug_init( void )
{
/* nothing */
}
+
#endif /* !FT_DEBUG_LEVEL_TRACE */
diff --git a/builds/win32/ftdebug.c b/builds/win32/ftdebug.c
index 41a738c..8294550 100644
--- a/builds/win32/ftdebug.c
+++ b/builds/win32/ftdebug.c
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for Win32 (body). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -85,16 +85,14 @@
}
-
-
-
#ifdef FT_DEBUG_LEVEL_TRACE
+
/* array of trace levels, initialized to 0 */
int ft_trace_levels[trace_count];
/* define array of trace toggle names */
-#define FT_TRACE_DEF(x) #x ,
+#define FT_TRACE_DEF( x ) #x ,
static const char* ft_trace_toggles[trace_count + 1] =
{
@@ -128,6 +126,7 @@
{
const char* ft2_debug = getenv( "FT2_DEBUG" );
+
if ( ft2_debug )
{
const char* p = ft2_debug;
@@ -194,14 +193,17 @@
}
}
+
#else /* !FT_DEBUG_LEVEL_TRACE */
+
FT_BASE_DEF( void )
ft_debug_init( void )
{
/* nothing */
}
+
#endif /* !FT_DEBUG_LEVEL_TRACE */