* 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.
This commit is contained in:
Werner Lemberg 2004-04-11 16:44:54 +00:00
parent 4c03580f76
commit 391de1a63e
3 changed files with 14 additions and 6 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -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 );