diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-10 22:52:40 +0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-05-14 20:02:20 -0700 |
| commit | 3db0064e4b6108716767b136ba5867c4cdf57f99 (patch) | |
| tree | 3ff38ae4ca931efe481b0d182e5ebd581009c6e0 | |
| parent | 8029fc07fc28e427979c81dd50087083e441d65d (diff) | |
| download | xorg-lib-libfontenc-3db0064e4b6108716767b136ba5867c4cdf57f99.tar.gz | |
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>
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/encparse.c | 9 | ||||
| -rw-r--r-- | src/fontenc.c | 9 |
3 files changed, 1 insertions, 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" |