diff options
| author | Werner Lemberg <wl@gnu.org> | 2002-02-22 00:58:04 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2002-02-22 00:58:04 +0000 |
| commit | af8df8503fdd0b3ee91cbd462a97636d8cf49c81 (patch) | |
| tree | 918f7b950d7d7108f62d8bb49b67709684de8737 /include/freetype/internal/ftdebug.h | |
| parent | 222cec8c201dfb93aae9e167ead620ea5065cd7b (diff) | |
| download | freetype2-af8df8503fdd0b3ee91cbd462a97636d8cf49c81.tar.gz | |
* include/freetype/internal/ftdebug.h (FT_Trace): Remove comma in
enum to avoid compiler warnings.
Diffstat (limited to 'include/freetype/internal/ftdebug.h')
| -rw-r--r-- | include/freetype/internal/ftdebug.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index b13aa78ce..3d1100abd 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h @@ -28,11 +28,11 @@ FT_BEGIN_HEADER /* force the definition of FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE */ -/* is already defined.. this simplifies the following #ifdefs.. */ +/* is already defined; this simplifies the following #ifdefs */ /* */ #ifdef FT_DEBUG_LEVEL_TRACE -# undef FT_DEBUG_LEVEL_ERROR -# define FT_DEBUG_LEVEL_ERROR +#undef FT_DEBUG_LEVEL_ERROR +#define FT_DEBUG_LEVEL_ERROR #endif @@ -45,26 +45,25 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_LEVEL_TRACE -# define FT_TRACE_DEF(x) trace_ ## x , +#define FT_TRACE_DEF( x ) trace_ ## x , - /* defining the enums */ + /* defining the enums */ typedef enum { -# include FT_INTERNAL_TRACE_H - trace_count, +#include FT_INTERNAL_TRACE_H + trace_count } FT_Trace; - /* defining the array of trace levels, provided by 'src/base/ftdebug.c' */ - extern int ft_trace_levels [ trace_count ]; + /* defining the array of trace levels, provided by `src/base/ftdebug.c' */ + extern int ft_trace_levels[trace_count]; -# undef FT_TRACE_DEF +#undef FT_TRACE_DEF #endif /* FT_DEBUG_LEVEL_TRACE */ - /*************************************************************************/ /* */ /* Define the FT_TRACE macro */ @@ -78,7 +77,7 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_LEVEL_TRACE -# define FT_TRACE( level, varformat ) \ +#define FT_TRACE( level, varformat ) \ do \ { \ if ( ft_trace_levels[FT_COMPONENT] >= level ) \ @@ -87,10 +86,11 @@ FT_BEGIN_HEADER #else /* !FT_DEBUG_LEVEL_TRACE */ -# define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */ +#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */ #endif /* !FT_DEBUG_LEVEL_TRACE */ + /*************************************************************************/ /* */ /* You need two opening resp. closing parentheses! */ @@ -109,7 +109,6 @@ FT_BEGIN_HEADER #define FT_TRACE7( varformat ) FT_TRACE( 7, varformat ) - /*************************************************************************/ /* */ /* Define the FT_ERROR macro */ @@ -118,11 +117,11 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_LEVEL_ERROR -# define FT_ERROR( varformat ) FT_Message varformat +#define FT_ERROR( varformat ) FT_Message varformat #else /* !FT_DEBUG_LEVEL_ERROR */ -# define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */ +#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */ #endif /* !FT_DEBUG_LEVEL_ERROR */ @@ -145,7 +144,7 @@ FT_BEGIN_HEADER #else /* !FT_DEBUG_LEVEL_ERROR */ -# define FT_ASSERT( condition ) do ; while ( 0 ) +#define FT_ASSERT( condition ) do ; while ( 0 ) #endif /* !FT_DEBUG_LEVEL_ERROR */ @@ -171,7 +170,6 @@ FT_BEGIN_HEADER #endif /* FT_DEBUG_LEVEL_ERROR */ - FT_BASE( void ) ft_debug_init( void ); |