diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
| commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
| tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/include/X11/fonts/bitmap.h | |
| parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
| parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
| download | vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2 vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'libXfont/include/X11/fonts/bitmap.h')
| -rw-r--r-- | libXfont/include/X11/fonts/bitmap.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libXfont/include/X11/fonts/bitmap.h b/libXfont/include/X11/fonts/bitmap.h index 731c85f5b..9b170a90a 100644 --- a/libXfont/include/X11/fonts/bitmap.h +++ b/libXfont/include/X11/fonts/bitmap.h @@ -37,11 +37,7 @@ from The Open Group. #define _BITMAP_H_ #include <X11/fonts/fntfilio.h> -#ifndef FONTMODULE #include <stdio.h> /* just for NULL */ -#else -#include "xf86_ansic.h" -#endif /* * Internal format used to store bitmap fonts @@ -94,7 +90,6 @@ extern Bool bitmapAddInkMetrics ( FontPtr pFont ); extern int bitmapComputeWeight ( FontPtr pFont ); extern void BitmapRegisterFontFileFunctions ( void ); -extern int BitmapGetRenderIndex ( FontRendererPtr renderer ); extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, int flags, FontEntryPtr entry, char *fileName, |