ref: 391de1a63e232ef840284588f1feb7f4c9c41169
parent: 4c03580f7690494d3ce60a143578d417474faec6
author: Werner Lemberg <[email protected]>
date: Sun Apr 11 12:44:54 EDT 2004
* src/lzw/ftlzw.c: Include zopen.h dependent on FT_CONFIG_OPTION_USE_LZW. * src/base/ftdebug.c: s/index/idx/ to avoid compiler warnings.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-10 Werner Lemberg <[email protected]>
+
+ * src/lzw/ftlzw.c: Include zopen.h dependent on
+ FT_CONFIG_OPTION_USE_LZW.
+
+ * src/base/ftdebug.c: s/index/idx/ to avoid compiler warnings.
+
2004-04-02 Werner Lemberg <[email protected]>
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -107,13 +107,13 @@
/* documentation is in ftdebug.h */
FT_EXPORT_DEF( const char * )
- FT_Trace_Get_Name( FT_Int index )
+ FT_Trace_Get_Name( FT_Int idx )
{int max = FT_Trace_Get_Count();
- if ( index < max )
- return ft_trace_toggles[index];
+ if ( idx < max )
+ return ft_trace_toggles[idx];
else
return NULL;
}
@@ -228,7 +228,7 @@
FT_EXPORT_DEF( const char * )
- FT_Trace_Get_Name( FT_Int index )
+ FT_Trace_Get_Name( FT_Int idx )
{ return NULL;
}
--- a/src/lzw/ftlzw.c
+++ b/src/lzw/ftlzw.c
@@ -28,7 +28,6 @@
#include FT_INTERNAL_DEBUG_H
#include <string.h>
#include <stdio.h>
-#include "zopen.h"
#include FT_MODULE_ERRORS_H
@@ -43,7 +42,9 @@
#ifdef FT_CONFIG_OPTION_USE_LZW
+#include "zopen.h"
+
/***************************************************************************/
/***************************************************************************/
/***** *****/
@@ -447,7 +448,7 @@
FT_EXPORT_DEF( FT_Error )
FT_Stream_OpenLZW( FT_Stream stream,
- FT_Stream source )
+ FT_Stream source )
{FT_UNUSED( stream );
FT_UNUSED( source );