walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove FTGLUE_API/APIDEF cruft. 

2007-10-11  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft.
This commit is contained in:
Behdad Esfahbod 2007-10-11 07:46:33 +00:00 committed by Behdad Esfahbod
parent 61ddbafaaa
commit 7cdfb61dee
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ftglue.c
View File

@ -51,7 +51,7 @@ _hb_ftglue_qalloc( FT_ULong size,
#define QALLOC(ptr,size) ( (ptr) = _hb_ftglue_qalloc( (size), &error ), error != 0 ) #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_ftglue_alloc( FT_ULong size,
HB_Error *perror ) 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, _hb_ftglue_realloc( FT_Pointer block,
FT_ULong new_size, FT_ULong new_size,
HB_Error *perror ) HB_Error *perror )
@ -92,7 +92,7 @@ _hb_ftglue_realloc( FT_Pointer block,
} }
FTGLUE_APIDEF( void ) void
_hb_ftglue_free( FT_Pointer block ) _hb_ftglue_free( FT_Pointer block )
{ {
if ( 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 ) _hb_ftglue_stream_pos( FT_Stream stream )
{ {
LOG(( "ftglue:stream:pos() -> %ld\n", stream->pos )); 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, _hb_ftglue_stream_seek( FT_Stream stream,
FT_Long pos ) 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, _hb_ftglue_stream_frame_enter( FT_Stream stream,
FT_ULong count ) FT_ULong count )
{ {
@ -176,7 +176,7 @@ Exit:
} }
FTGLUE_APIDEF( void ) void
_hb_ftglue_stream_frame_exit( FT_Stream stream ) _hb_ftglue_stream_frame_exit( FT_Stream stream )
{ {
if ( stream->read ) 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, _hb_ftglue_face_goto_table( FT_Face face,
FT_ULong the_tag, FT_ULong the_tag,
FT_Stream stream ) FT_Stream stream )

24
src/ftglue.h
View File

@ -59,14 +59,6 @@ FT_BEGIN_HEADER
#define SET_ERR(c) ( (error = (c)) != 0 ) #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 */ /* stream macros used by the OpenType parser */
#define FILE_Pos() _hb_ftglue_stream_pos( stream ) #define FILE_Pos() _hb_ftglue_stream_pos( stream )
#define FILE_Seek(pos) SET_ERR( _hb_ftglue_stream_seek( stream, pos ) ) #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_ULong() ((FT_ULong)GET_Long())
#define GET_Tag4() GET_ULong() #define GET_Tag4() GET_ULong()
FTGLUE_API( FT_Long ) FT_Long
_hb_ftglue_stream_pos( FT_Stream stream ); _hb_ftglue_stream_pos( FT_Stream stream );
FTGLUE_API( HB_Error ) HB_Error
_hb_ftglue_stream_seek( FT_Stream stream, _hb_ftglue_stream_seek( FT_Stream stream,
FT_Long pos ); FT_Long pos );
FTGLUE_API( HB_Error ) HB_Error
_hb_ftglue_stream_frame_enter( FT_Stream stream, _hb_ftglue_stream_frame_enter( FT_Stream stream,
FT_ULong size ); FT_ULong size );
FTGLUE_API( void ) void
_hb_ftglue_stream_frame_exit( FT_Stream stream ); _hb_ftglue_stream_frame_exit( FT_Stream stream );
FTGLUE_API( HB_Error ) HB_Error
_hb_ftglue_face_goto_table( FT_Face face, _hb_ftglue_face_goto_table( FT_Face face,
FT_ULong tag, FT_ULong tag,
FT_Stream stream ); 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) ) #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_ftglue_alloc( FT_ULong size,
HB_Error *perror_ ); HB_Error *perror_ );
FTGLUE_API( FT_Pointer ) FT_Pointer
_hb_ftglue_realloc( FT_Pointer block, _hb_ftglue_realloc( FT_Pointer block,
FT_ULong new_size, FT_ULong new_size,
HB_Error *perror_ ); HB_Error *perror_ );
FTGLUE_API( void ) void
_hb_ftglue_free( FT_Pointer block ); _hb_ftglue_free( FT_Pointer block );
/* abuse these private header/source files */ /* abuse these private header/source files */