From d0f70707dde032e662dbd5bc70df6ac915403abe Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 8 Sep 2014 23:42:34 +0200
Subject: Updated to libXfont 1.5.0

---
 libXfont/src/bitmap/bitmapfunc.c | 43 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'libXfont/src/bitmap/bitmapfunc.c')

diff --git a/libXfont/src/bitmap/bitmapfunc.c b/libXfont/src/bitmap/bitmapfunc.c
index 47ce488d0..8c6b3d896 100644
--- a/libXfont/src/bitmap/bitmapfunc.c
+++ b/libXfont/src/bitmap/bitmapfunc.c
@@ -32,34 +32,25 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 
-/*
- * Translate monolithic #defines to modular definitions
- */
-
-#ifdef PCFFORMAT
-#define XFONT_PCFFORMAT 1
-#endif
-
-#ifdef SNFFORMAT
-#define XFONT_SNFFORMAT 1
-#endif
-
-#ifdef BDFFORMAT
-#define XFONT_BDFFORMAT 1
-#endif
-
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/bitmap.h>
 #include <X11/fonts/fontutil.h>
+#if XFONT_BDFFORMAT
 #include <X11/fonts/bdfint.h>
+#endif
+#if XFONT_PCFFORMAT
 #include <X11/fonts/pcf.h>
+#endif
+#if XFONT_SNFFORMAT
 #include "snfstr.h"
+#endif
 
+#if XFONT_PCFFORMAT || XFONT_SNFFORMAT || XFONT_BDFFORMAT
 typedef struct _BitmapFileFunctions {
-    int         (*ReadFont) (FontPtr /* pFont */, FontFilePtr /* file */,  
-			     int /* bit */, int /* byte */, 
+    int         (*ReadFont) (FontPtr /* pFont */, FontFilePtr /* file */,
+			     int /* bit */, int /* byte */,
 			     int /* glyph */, int /* scan */);
-    int         (*ReadInfo) (  FontInfoPtr /* pFontInfo */, 
+    int         (*ReadInfo) (  FontInfoPtr /* pFontInfo */,
 			       FontFilePtr /* file */ );
 }           BitmapFileFunctionsRec, *BitmapFileFunctionsPtr;
 
@@ -107,8 +98,8 @@ static BitmapFileFunctionsRec readers[] = {
 #define CAPABILITIES (CAP_MATRIX | CAP_CHARSUBSETTING)
 
 static int
-BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, 
-		  FontEntryPtr entry, char *fileName, 
+BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags,
+		  FontEntryPtr entry, char *fileName,
 		  fsBitmapFormat format, fsBitmapFormatMask fmask,
 		  FontPtr non_cachable_font) /* We don't do licensing */
 {
@@ -152,7 +143,7 @@ BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags,
 }
 
 static int
-BitmapGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo, 
+BitmapGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo,
 		     FontEntryPtr entry, char *fileName)
 {
     FontFilePtr file;
@@ -252,3 +243,11 @@ BitmapGetRenderIndex(FontRendererPtr renderer)
 {
     return renderer - renderers;
 }
+
+#else
+void
+BitmapRegisterFontFileFunctions (void)
+{
+    /* nothing to do */
+}
+#endif /* XFONT_PCFFORMAT || XFONT_SNFFORMAT || XFONT_BDFFORMAT */
-- 
cgit v1.2.3