From 3db0064e4b6108716767b136ba5867c4cdf57f99 Mon Sep 17 00:00:00 2001
From: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon, 10 May 2010 22:52:40 +0700
Subject: unifdef FONTENC_NO_LIBFONT

This symbol was unconditionally defined in Makefile
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 src/Makefile.am | 3 +--
 src/encparse.c  | 9 ---------
 src/fontenc.c   | 9 ---------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 97111ee..96d0a38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,8 +12,7 @@ AM_CFLAGS = \
 FONTENCDIR=@ENCODINGSDIR@
 FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
 
-INCLUDES = -I$(top_srcdir)/include \
-	   -DFONTENC_NO_LIBFONT $(FONTENCDEFS)
+INCLUDES = -I$(top_srcdir)/include $(FONTENCDEFS)
 
 
 libfontenc_la_LIBADD = @FONTENC_LIBS@
diff --git a/src/encparse.c b/src/encparse.c
index c738878..27215df 100644
--- a/src/encparse.c
+++ b/src/encparse.c
@@ -34,13 +34,6 @@ THE SOFTWARE.
 #include <strings.h>
 #endif
 
-#ifndef FONTENC_NO_LIBFONT
-
-#include <X11/fonts/fntfilio.h>
-#include <X11/fonts/fntfilst.h>
-
-#else
-
 #include <stdlib.h>
 #define xalloc(n) malloc(n)
 #define xrealloc(p, n) realloc(p, n)
@@ -55,8 +48,6 @@ typedef gzFile FontFilePtr;
 #define MAXFONTFILENAMELEN 1024
 #define MAXFONTNAMELEN 1024
 
-#endif
-
 #include <X11/fonts/fontenc.h>
 #include "fontencI.h"
 
diff --git a/src/fontenc.c b/src/fontenc.c
index 013a777..76de4e3 100644
--- a/src/fontenc.c
+++ b/src/fontenc.c
@@ -28,13 +28,6 @@ THE SOFTWARE.
 #include <strings.h>
 #endif
 
-#ifndef FONTENC_NO_LIBFONT
-
-#include <X11/fonts/fontmisc.h>           /* defines xalloc and friends */
-#include <X11/fonts/fntfilst.h>
-
-#else
-
 #include <stdlib.h>
 #define xalloc(n) malloc(n)
 #define xrealloc(p, n) realloc(p, n)
@@ -44,8 +37,6 @@ THE SOFTWARE.
 #define MAXFONTNAMELEN 1024
 #define MAXFONTFILENAMELEN 1024
 
-#endif /* FONTENC_NO_FONTFILE */
-
 #include <X11/fonts/fontenc.h>
 #include "fontencI.h"
 
-- 
cgit v1.2.1