From 6dd755aa923291db2501cc5c22e409c41a70e3c1 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 1 Oct 2013 12:23:16 +0200 Subject: Update following packages: libXpm-3.5.11 libXaw-1.0.12 libXfont-1.4.6 libXrender-0.9.8 xproto-7.0.24 inputproto-2.3 xclock-1.0.7 xhost-1.0.6 --- libXfont/src/fc/fservestr.h | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'libXfont/src/fc/fservestr.h') diff --git a/libXfont/src/fc/fservestr.h b/libXfont/src/fc/fservestr.h index a6d0d1d53..29ae46ee8 100644 --- a/libXfont/src/fc/fservestr.h +++ b/libXfont/src/fc/fservestr.h @@ -139,12 +139,7 @@ typedef struct _fs_reconnect { } FSReconnectRec, *FSReconnectPtr; -#if !defined(UNIXCPP) || defined(ANSICPP) #define fsCat(x,y) x##_##y -#else -#define fsCat(x,y) x/**/_/**/y -#endif - /* copy XCharInfo parts of a protocol reply into a xCharInfo */ @@ -182,18 +177,18 @@ typedef struct _fs_reconnect { fsUnpack_XCharInfo((packet)->font_header_max_bounds, &(structure)->ink_maxbounds) extern void _fs_init_fontinfo ( FSFpePtr conn, FontInfoPtr pfi ); -extern int _fs_convert_props ( fsPropInfo *pi, fsPropOffset *po, pointer pd, +extern int _fs_convert_props ( fsPropInfo *pi, fsPropOffset *po, pointer pd, FontInfoPtr pfi ); -extern int _fs_convert_lfwi_reply ( FSFpePtr conn, FontInfoPtr pfi, - fsListFontsWithXInfoReply *fsrep, - fsPropInfo *pi, fsPropOffset *po, +extern int _fs_convert_lfwi_reply ( FSFpePtr conn, FontInfoPtr pfi, + fsListFontsWithXInfoReply *fsrep, + fsPropInfo *pi, fsPropOffset *po, pointer pd ); -extern int fs_build_range ( FontPtr pfont, Bool range_flag, - unsigned int count, int item_size, - unsigned char *data, int *nranges, +extern int fs_build_range ( FontPtr pfont, Bool range_flag, + unsigned int count, int item_size, + unsigned char *data, int *nranges, fsRange **ranges ); -extern void _fs_clean_aborted_loadglyphs ( FontPtr pfont, - int num_expected_ranges, +extern void _fs_clean_aborted_loadglyphs ( FontPtr pfont, + int num_expected_ranges, fsRange *expected_ranges ); extern void _fs_init_font ( FontPtr pfont ); extern pointer fs_alloc_glyphs (FontPtr pFont, int size); -- cgit v1.2.3