Commit 80c253f9e88e2fd94deaaa692d776314b2eaa504
2009-03-19T08:05:06
Remove unused WinCE code. * builds/win32/ftdebug.c: Remove code guarded with `_WIN32_WCE'. Since WinCE is handled separately this is no longer needed.
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
diff --git a/ChangeLog b/ChangeLog
index 40385cb..7315817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-19 Werner Lemberg <wl@gnu.org>
+
+ Remove unused WinCE code.
+
+ * builds/win32/ftdebug.c: Remove code guarded with `_WIN32_WCE'.
+ Since WinCE is handled separately this is no longer needed.
+
2009-03-16 Werner Lemberg <wl@gnu.org>
docmaker: Don't ignore single-line code blocks.
diff --git a/builds/win32/ftdebug.c b/builds/win32/ftdebug.c
index 8f7a9ab..d1ca15a 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, 2002, 2005, 2008 by */
+/* Copyright 1996-2001, 2002, 2005, 2008, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -55,29 +55,6 @@
#include <windows.h>
-#ifdef _WIN32_WCE
-
- void
- OutputDebugStringEx( const char* str )
- {
- static WCHAR buf[8192];
-
-
- int sz = MultiByteToWideChar( CP_ACP, 0, str, -1, buf,
- sizeof ( buf ) / sizeof ( *buf ) );
- if ( !sz )
- lstrcpyW( buf, L"OutputDebugStringEx: MultiByteToWideChar failed" );
-
- OutputDebugStringW( buf );
- }
-
-#else
-
-#define OutputDebugStringEx OutputDebugStringA
-
-#endif
-
-
FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
{
@@ -89,7 +66,7 @@
vprintf( fmt, ap );
/* send the string to the debugger as well */
vsprintf( buf, fmt, ap );
- OutputDebugStringEx( buf );
+ OutputDebugStringA( buf );
va_end( ap );
}
@@ -103,7 +80,7 @@
va_start( ap, fmt );
vsprintf( buf, fmt, ap );
- OutputDebugStringEx( buf );
+ OutputDebugStringA( buf );
va_end( ap );
exit( EXIT_FAILURE );
@@ -149,19 +126,8 @@
FT_BASE_DEF( void )
ft_debug_init( void )
{
-#ifdef _WIN32_WCE
-
- /* Windows Mobile doesn't have environment API: */
- /* GetEnvironmentStrings, GetEnvironmentVariable, getenv. */
- /* */
- /* FIXME!!! How to set debug mode? */
- const char* ft2_debug = 0;
-
-#else
-
const char* ft2_debug = getenv( "FT2_DEBUG" );
-#endif
if ( ft2_debug )
{