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/include/X11/fonts/bdfint.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libXfont/include/X11/fonts/bdfint.h') diff --git a/libXfont/include/X11/fonts/bdfint.h b/libXfont/include/X11/fonts/bdfint.h index 913f660df..cc464cbdf 100644 --- a/libXfont/include/X11/fonts/bdfint.h +++ b/libXfont/include/X11/fonts/bdfint.h @@ -65,23 +65,23 @@ typedef struct BDFSTAT { BOOL haveDefaultCh; } bdfFileState; -extern void bdfError ( char * message, ... ); -extern void bdfWarning ( char *message, ... ); -extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, +extern void bdfError ( const char * message, ... ) _X_ATTRIBUTE_PRINTF(1, 2); +extern void bdfWarning ( const char *message, ... ) _X_ATTRIBUTE_PRINTF(1, 2); +extern unsigned char * bdfGetLine ( FontFilePtr file, unsigned char *buf, int len ); -extern Atom bdfForceMakeAtom ( char *str, int *size ); +extern Atom bdfForceMakeAtom ( const char *str, int *size ); extern Atom bdfGetPropertyValue ( char *s ); extern int bdfIsInteger ( char *str ); extern unsigned char bdfHexByte ( unsigned char *s ); -extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, +extern Bool bdfSpecialProperty ( FontPtr pFont, FontPropPtr prop, char isString, bdfFileState *bdfState ); -extern int bdfReadFont( FontPtr pFont, FontFilePtr file, +extern int bdfReadFont( FontPtr pFont, FontFilePtr file, int bit, int byte, int glyph, int scan ); extern int bdfReadFontInfo( FontInfoPtr pFontInfo, FontFilePtr file ); -extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, +extern void FontCharInkMetrics ( FontPtr pFont, CharInfoPtr pCI, xCharInfo *pInk ); -extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, +extern void FontCharReshape ( FontPtr pFont, CharInfoPtr pSrc, CharInfoPtr pDst ); #endif /* BDFINT_H */ -- cgit v1.2.3