diff options
| author | Behdad Esfahbod <pango@behdad.org> | 2005-08-15 04:19:15 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2005-08-15 04:19:15 +0000 |
| commit | e6a44a353b49708e98e61343e503289229452eee (patch) | |
| tree | 4ec4df2b94461a02c3c98d86f91f17b97dc8d8d3 | |
| parent | d25e791ba3edccbe38bcb0ee415399531872b795 (diff) | |
| download | pango-e6a44a353b49708e98e61343e503289229452eee.tar.gz | |
Replace perror with perror_. Remove FT_BEGIN_STMNT and FT_END_STMNT.
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)
| -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-08 Roozbeh Pournader <roozbeh@farsiweb.info> * docs/tmpl/scripts.sgml, modules/arabic/arabic-ot.c, diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a93bf1e3..f54b72bf 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-08 Roozbeh Pournader <roozbeh@farsiweb.info> * docs/tmpl/scripts.sgml, modules/arabic/arabic-ot.c, 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, |