diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXfont/src/fc/fservestr.h | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXfont/src/fc/fservestr.h')
| -rw-r--r-- | libXfont/src/fc/fservestr.h | 23 |
1 files changed, 9 insertions, 14 deletions
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); |