ref: 67ffd8cd19e1fc3bb48c8855061f4fe7a348c6d6
parent: f57496089916eb83c049091210ce3249548cce81
author: Werner Lemberg <[email protected]>
date: Thu Apr 18 10:26:29 EDT 2002
formatting
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,15 @@
2002-04-18 David Turner <[email protected]>
- * 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..
+ * 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:
-
- adding new experimental files for 2.1.1 (or 2.1.2)
-
+ * 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 <[email protected]>
--- a/builds/amiga/src/base/ftdebug.c
+++ b/builds/amiga/src/base/ftdebug.c
@@ -101,6 +101,7 @@
{const char* ft2_debug = getenv( "FT2_DEBUG" );
+
if ( ft2_debug )
{const char* p = ft2_debug;
@@ -167,13 +168,16 @@
}
}
+
#else /* !FT_DEBUG_LEVEL_TRACE */
+
FT_BASE_DEF( void )
ft_debug_init( void )
{/* nothing */
}
+
#endif /* !FT_DEBUG_LEVEL_TRACE */
--- 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,13 +193,16 @@
}
}
+
#else /* !FT_DEBUG_LEVEL_TRACE */
+
FT_BASE_DEF( void )
ft_debug_init( void )
{/* nothing */
}
+
#endif /* !FT_DEBUG_LEVEL_TRACE */