SwallowOS/xorg_lib_libfontenc
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libfontenc synced 2025-11-08 16:25:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

unifdef FONTENC_NO_LIBFONT

Browse Source 
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>
This commit is contained in:
Mikhail Gusarov
2010-05-10 22:52:40 +07:00
committed by Alan Coopersmith
parent 8029fc07fc
commit 3db0064e4b
3 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -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@

9
src/encparse.c
View File

@@ -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"

9
src/fontenc.c
View File

@@ -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"