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/include/X11/fonts/pcf.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/include/X11/fonts/pcf.h')
| -rw-r--r-- | libXfont/include/X11/fonts/pcf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXfont/include/X11/fonts/pcf.h b/libXfont/include/X11/fonts/pcf.h index a5fdbcd01..ddce0a936 100644 --- a/libXfont/include/X11/fonts/pcf.h +++ b/libXfont/include/X11/fonts/pcf.h @@ -88,10 +88,10 @@ typedef struct _PCFTable { #define PCF_GLYPH_NAMES (1<<7) #define PCF_BDF_ACCELERATORS (1<<8) -extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, +extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, int bit, int byte, int glyph, int scan ); extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file ); extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file ); -extern void pcfError ( const char *, ... ); +extern void pcfError ( const char *, ... ) _X_ATTRIBUTE_PRINTF(1, 2); #endif /* _PCF_H_ */ |