diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | pango/opentype/ftglue.h | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2005-08-15 Behdad Esfahbod <pango@behdad.org> + + * pango/opentype/ftglue.h: Replace perror with perror_. + Remove FT_BEGIN_STMNT and FT_END_STMNT. (#313477) + 2005-08-14 Behdad Esfahbod <pango@behdad.org> * examples/HELLO.utf8: Remove some characters at the beginning diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8936507f..bf8550f3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2005-08-15 Behdad Esfahbod <pango@behdad.org> + + * pango/opentype/ftglue.h: Replace perror with perror_. + Remove FT_BEGIN_STMNT and FT_END_STMNT. (#313477) + 2005-08-14 Behdad Esfahbod <pango@behdad.org> * examples/HELLO.utf8: Remove some characters at the beginning diff --git a/pango/opentype/ftglue.h b/pango/opentype/ftglue.h index cc780fe6..57c5ebe9 100644 --- a/pango/opentype/ftglue.h +++ b/pango/opentype/ftglue.h @@ -116,13 +116,13 @@ ftglue_face_goto_table( FT_Face face, ( (_ptr) = ftglue_realloc( memory, (_ptr), (_oldsz), (_newsz), &error ), error != 0 ) #define FREE(_ptr) \ - FT_BEGIN_STMNT \ + do { \ if ( (_ptr) ) \ { \ ftglue_free( memory, _ptr ); \ _ptr = NULL; \ } \ - FT_END_STMNT + } while (0) #define ALLOC_ARRAY(_ptr,_count,_type) \ ALLOC(_ptr,(_count)*sizeof(_type)) @@ -136,14 +136,14 @@ ftglue_face_goto_table( FT_Face face, FTGLUE_API( FT_Pointer ) ftglue_alloc( FT_Memory memory, FT_ULong size, - FT_Error *perror ); + FT_Error *perror_ ); FTGLUE_API( FT_Pointer ) ftglue_realloc( FT_Memory memory, FT_Pointer block, FT_ULong old_size, FT_ULong new_size, - FT_Error *perror ); + FT_Error *perror_ ); FTGLUE_API( void ) ftglue_free( FT_Memory memory, |