From dc35a2c85d33427be2a9cfb477f3fb1779950edf Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sun, 11 Apr 2004 16:44:54 +0000
Subject: [PATCH] * 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.
---
 ChangeLog          | 7 +++++++
 src/base/ftdebug.c | 8 ++++----
 src/lzw/ftlzw.c    | 5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db093bc34..fb4f7b7a2 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 d8ccd8013..b84edbfe2 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 888df8e88..a0e4cc576 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 );