diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:23:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:28:08 +0200 |
| commit | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (patch) | |
| tree | fa88a321afc13657f7687a25d466f49151c9599a /libXfont/include/X11/fonts/fntfilst.h | |
| parent | a5391fdea94a7b827069c6f926f83a235076ccb4 (diff) | |
| download | vcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.tar.gz vcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.tar.bz2 vcxsrv-6dd755aa923291db2501cc5c22e409c41a70e3c1.zip | |
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
Diffstat (limited to 'libXfont/include/X11/fonts/fntfilst.h')
| -rw-r--r-- | libXfont/include/X11/fonts/fntfilst.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libXfont/include/X11/fonts/fntfilst.h b/libXfont/include/X11/fonts/fntfilst.h index 29e0a56fb..6e8645e16 100644 --- a/libXfont/include/X11/fonts/fntfilst.h +++ b/libXfont/include/X11/fonts/fntfilst.h @@ -124,34 +124,34 @@ typedef struct _FontDirectory { #define CAP_CHARSUBSETTING 0x2 typedef struct _FontRenderer { - char *fileSuffix; + const char *fileSuffix; int fileSuffixLen; - int (*OpenBitmap)(FontPathElementPtr /* fpe */, + int (*OpenBitmap)(FontPathElementPtr /* fpe */, FontPtr * /* pFont */, - int /* flags */, - FontEntryPtr /* entry */, - char * /* fileName */, - fsBitmapFormat /* format */, + int /* flags */, + FontEntryPtr /* entry */, + char * /* fileName */, + fsBitmapFormat /* format */, fsBitmapFormatMask /* mask */, FontPtr /* non_cachable_font */); - int (*OpenScalable)(FontPathElementPtr /* fpe */, - FontPtr * /* pFont */, - int /* flags */, - FontEntryPtr /* entry */, - char * /* fileName */, - FontScalablePtr /* vals */, - fsBitmapFormat /* format */, + int (*OpenScalable)(FontPathElementPtr /* fpe */, + FontPtr * /* pFont */, + int /* flags */, + FontEntryPtr /* entry */, + char * /* fileName */, + FontScalablePtr /* vals */, + fsBitmapFormat /* format */, fsBitmapFormatMask /* fmask */, FontPtr /* non_cachable_font */); - int (*GetInfoBitmap)(FontPathElementPtr /* fpe */, - FontInfoPtr /* pFontInfo */, - FontEntryPtr /* entry */, + int (*GetInfoBitmap)(FontPathElementPtr /* fpe */, + FontInfoPtr /* pFontInfo */, + FontEntryPtr /* entry */, char * /*fileName */); - int (*GetInfoScalable)(FontPathElementPtr /* fpe */, - FontInfoPtr /* pFontInfo */, - FontEntryPtr /* entry */, + int (*GetInfoScalable)(FontPathElementPtr /* fpe */, + FontInfoPtr /* pFontInfo */, + FontEntryPtr /* entry */, FontNamePtr /* fontName */, - char * /* fileName */, + char * /* fileName */, FontScalablePtr /* vals */); int number; int capabilities; /* Bitmap components defined above */ |