[xorg-commit-diffs] xc/lib/font/util Imakefile, 1.1.4.2, 1.1.4.3 utilbitmap.c, 1.1.4.2, 1.1.4.3

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/lib/font/util
In directory pdx:/tmp/cvs-serv5532/lib/font/util

Modified Files:
      Tag: XORG-CURRENT
	Imakefile utilbitmap.c 
Log Message:
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/util/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:39:42 -0000	1.1.4.2
+++ b/Imakefile	21 Apr 2004 10:03:17 -0000	1.1.4.3
@@ -19,7 +19,16 @@
        it doesn't break anything. */
      SYS_DEFINES = -D__XPG4_CHAR_CLASS__
 #endif
-         DEFINES = StrcasecmpDefines $(SYS_DEFINES)
+/* See xc/lib/font/FreeType/Imakefile - if we build the internal version of
+ * FreeType we should not implement functions already defined by it
+ * (see http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=513)
+ */
+#if !HasFreetype2 && !SharedLibFreetype2
+INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE
+#endif
+
+
+         DEFINES = StrcasecmpDefines $(SYS_DEFINES) $(INTERNALDEFINES)
 
             SRCS = utilbitmap.c fontnames.c fontutil.c fontxlfd.c format.c \
 		   fontaccel.c atom.c miscutil.c private.c patcache.c

Index: utilbitmap.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/util/utilbitmap.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/utilbitmap.c	5 Mar 2004 13:39:42 -0000	1.1.4.2
+++ b/utilbitmap.c	21 Apr 2004 10:03:17 -0000	1.1.4.3
@@ -27,6 +27,8 @@
 */
 /* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
 
+#ifndef USE_INTERNAL_FREETYPE
+
 /*
  * Author:  Keith Packard, MIT X Consortium
  */
@@ -181,3 +183,6 @@
     }
     return dstWidthBytes * height;
 }
+
+#endif /* !USE_INTERNAL_FREETYPE */
+