diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-05-15 20:43:34 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-05-23 17:20:55 -0700 |
commit | a81f1a9bd3cd0a9d45d93d5b9e392b4e08ac60f7 (patch) | |
tree | 7de65211ad408959beb911828bfb63a7d0ea2ec0 | |
parent | 37595cfd4feaf031552d66f96dc6d58686f9c851 (diff) |
Drop imake/monolithic compatibility #define mapping
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@oracle.com>
Reviewed-by: RĂ©mi Cardona <remi@gentoo.org>
-rw-r--r-- | src/bitmap/bitmapfunc.c | 16 | ||||
-rw-r--r-- | src/bitmap/bitscale.c | 16 |
2 files changed, 0 insertions, 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> |