diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-10-11 07:46:33 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-10-11 07:46:33 +0000 |
| commit | 76e662883f0966862c09bbc13eaa7b6d968d86bd (patch) | |
| tree | 410c8f8b8506b50611d74f6862784942c2773dba | |
| parent | 3739b7e3448f3277eed7c027905bf602e5afb404 (diff) | |
| download | pango-76e662883f0966862c09bbc13eaa7b6d968d86bd.tar.gz | |
Remove FTGLUE_API/APIDEF cruft.
2007-10-11 Behdad Esfahbod <behdad@gnome.org>
* pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft.
svn path=/trunk/; revision=2441
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pango/opentype/ftglue.c | 16 | ||||
| -rw-r--r-- | pango/opentype/ftglue.h | 24 |
3 files changed, 20 insertions, 24 deletions
@@ -1,5 +1,9 @@ 2007-10-11 Behdad Esfahbod <behdad@gnome.org> + * pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft. + +2007-10-11 Behdad Esfahbod <behdad@gnome.org> + * pango/opentype/Makefile.am: Build harfbuzz.c instead of individual source files, to let compiler go wild with optimizations! diff --git a/pango/opentype/ftglue.c b/pango/opentype/ftglue.c index 9fd0f41f..8dd6bb9c 100644 --- a/pango/opentype/ftglue.c +++ b/pango/opentype/ftglue.c @@ -51,7 +51,7 @@ _hb_ftglue_qalloc( FT_ULong size, #define QALLOC(ptr,size) ( (ptr) = _hb_ftglue_qalloc( (size), &error ), error != 0 ) -FTGLUE_APIDEF( FT_Pointer ) +FT_Pointer _hb_ftglue_alloc( FT_ULong size, HB_Error *perror ) { @@ -72,7 +72,7 @@ _hb_ftglue_alloc( FT_ULong size, } -FTGLUE_APIDEF( FT_Pointer ) +FT_Pointer _hb_ftglue_realloc( FT_Pointer block, FT_ULong new_size, HB_Error *perror ) @@ -92,7 +92,7 @@ _hb_ftglue_realloc( FT_Pointer block, } -FTGLUE_APIDEF( void ) +void _hb_ftglue_free( FT_Pointer block ) { if ( block ) @@ -100,7 +100,7 @@ _hb_ftglue_free( FT_Pointer block ) } -FTGLUE_APIDEF( FT_Long ) +FT_Long _hb_ftglue_stream_pos( FT_Stream stream ) { LOG(( "ftglue:stream:pos() -> %ld\n", stream->pos )); @@ -108,7 +108,7 @@ _hb_ftglue_stream_pos( FT_Stream stream ) } -FTGLUE_APIDEF( HB_Error ) +HB_Error _hb_ftglue_stream_seek( FT_Stream stream, FT_Long pos ) { @@ -128,7 +128,7 @@ _hb_ftglue_stream_seek( FT_Stream stream, } -FTGLUE_APIDEF( HB_Error ) +HB_Error _hb_ftglue_stream_frame_enter( FT_Stream stream, FT_ULong count ) { @@ -176,7 +176,7 @@ Exit: } -FTGLUE_APIDEF( void ) +void _hb_ftglue_stream_frame_exit( FT_Stream stream ) { if ( stream->read ) @@ -190,7 +190,7 @@ _hb_ftglue_stream_frame_exit( FT_Stream stream ) } -FTGLUE_APIDEF( HB_Error ) +HB_Error _hb_ftglue_face_goto_table( FT_Face face, FT_ULong the_tag, FT_Stream stream ) diff --git a/pango/opentype/ftglue.h b/pango/opentype/ftglue.h index 1e13a2c4..cb71add5 100644 --- a/pango/opentype/ftglue.h +++ b/pango/opentype/ftglue.h @@ -59,14 +59,6 @@ FT_BEGIN_HEADER #define SET_ERR(c) ( (error = (c)) != 0 ) -#ifndef FTGLUE_API -#define FTGLUE_API(x) extern x -#endif - -#ifndef FTGLUE_APIDEF -#define FTGLUE_APIDEF(x) x -#endif - /* stream macros used by the OpenType parser */ #define FILE_Pos() _hb_ftglue_stream_pos( stream ) #define FILE_Seek(pos) SET_ERR( _hb_ftglue_stream_seek( stream, pos ) ) @@ -91,21 +83,21 @@ FT_BEGIN_HEADER #define GET_ULong() ((FT_ULong)GET_Long()) #define GET_Tag4() GET_ULong() -FTGLUE_API( FT_Long ) +FT_Long _hb_ftglue_stream_pos( FT_Stream stream ); -FTGLUE_API( HB_Error ) +HB_Error _hb_ftglue_stream_seek( FT_Stream stream, FT_Long pos ); -FTGLUE_API( HB_Error ) +HB_Error _hb_ftglue_stream_frame_enter( FT_Stream stream, FT_ULong size ); -FTGLUE_API( void ) +void _hb_ftglue_stream_frame_exit( FT_Stream stream ); -FTGLUE_API( HB_Error ) +HB_Error _hb_ftglue_face_goto_table( FT_Face face, FT_ULong tag, FT_Stream stream ); @@ -135,16 +127,16 @@ _hb_ftglue_face_goto_table( FT_Face face, #define MEM_Copy(dest,source,count) memcpy( (char*)(dest), (const char*)(source), (size_t)(count) ) -FTGLUE_API( FT_Pointer ) +FT_Pointer _hb_ftglue_alloc( FT_ULong size, HB_Error *perror_ ); -FTGLUE_API( FT_Pointer ) +FT_Pointer _hb_ftglue_realloc( FT_Pointer block, FT_ULong new_size, HB_Error *perror_ ); -FTGLUE_API( void ) +void _hb_ftglue_free( FT_Pointer block ); /* abuse these private header/source files */ |