Bug 44826 - <alias> must contain only a single <family>

[fontconfig.git] / src / ftglue.h

diff --git a/src/ftglue.h b/src/ftglue.h
index 93fd91efd32fffbaed88e1b7a055508d5f9e1da5..e0fd1714e381b075e4553dc7e8f113e945c1525c 100644 (file)
--- a/src/ftglue.h
+++ b/src/ftglue.h
@@ -43,22 +43,18 @@
 #ifndef __OPENTYPE_FTGLUE_H__
 #define __OPENTYPE_FTGLUE_H__
 
+#include "fcint.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 FT_BEGIN_HEADER
 
 
-/* utility macros */
-#define  TT_Err_Ok                   FT_Err_Ok
-#define  TT_Err_Invalid_Argument     FT_Err_Invalid_Argument
-#define  TT_Err_Invalid_Face_Handle  FT_Err_Invalid_Face_Handle
-#define  TT_Err_Table_Missing        FT_Err_Table_Missing
-
 #define  SET_ERR(c)   ( (error = (c)) != 0 )
 
 #ifndef FTGLUE_API
-#define FTGLUE_API(x)  extern x
+#define FTGLUE_API(x)  extern FcPrivate x
 #endif
 
 #ifndef FTGLUE_APIDEF
@@ -105,38 +101,11 @@ ftglue_stream_frame_enter( FT_Stream   stream,
 FTGLUE_API( void )
 ftglue_stream_frame_exit( FT_Stream  stream );
 
-FTGLUE_API( FT_Byte )
-ftglue_stream_get_byte( FT_Stream  stream );
-
-FTGLUE_API( FT_Short )
-ftglue_stream_get_short( FT_Stream  stream );
-
-FTGLUE_API( FT_Long )
-ftglue_stream_get_long( FT_Stream   stream );
-
 FTGLUE_API( FT_Error )
 ftglue_face_goto_table( FT_Face    face,
                         FT_ULong   tag,
                         FT_Stream  stream );
 
-FTGLUE_API( FT_Pointer )
-ftglue_alloc( FT_Memory  memory,
-              FT_ULong   size,
-              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_ );
-
-FTGLUE_API( void )
-ftglue_free( FT_Memory   memory,
-             FT_Pointer  block );
-
-/* */
-
 FT_END_HEADER
 
 #endif /* __OPENTYPE_FTGLUE_H__ */