Commit 391de1a63e232ef840284588f1feb7f4c9c41169
2004-04-11T16:44:54
* 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.
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
diff --git a/ChangeLog b/ChangeLog
index db093bc..fb4f7b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-10 Werner Lemberg <wl@gnu.org>
+
+ * 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 <wl@gnu.org>
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index d8ccd80..b84edbf 100644
--- 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;
}
diff --git a/src/lzw/ftlzw.c b/src/lzw/ftlzw.c
index 888df8e..a0e4cc5 100644
--- 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,6 +42,8 @@
#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 );