[PATCH:libXfont 3/5] Drop imake/monolithic compatibility #define mapping

[Alan Coopersmith]

Require the #defines from configure.ac now that we're not sharing source
with the imake builds any longer.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/bitmap/bitmapfunc.c |   16 ----------------
 src/bitmap/bitscale.c   |   16 ----------------
 2 files changed, 32 deletions(-)

diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c
index 603d5d9..d942b42 100644
--- a/src/bitmap/bitmapfunc.c
+++ b/src/bitmap/bitmapfunc.c
@@ -32,22 +32,6 @@ 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>
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index b864a28..b32639f 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -34,22 +34,6 @@ 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>
-- 
1.7.9.2