[xorg-commit-diffs] xc/programs/xfs/difs Imakefile, 1.1.4.2, 1.1.4.3 fonts.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xfs/difs
In directory pdx:/home/eich/tstbuild/xc/programs/xfs/difs

Modified Files:
      Tag: XORG-CURRENT
	Imakefile fonts.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xfs/difs/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:41:23 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:17:41 -0000	1.1.4.3
@@ -16,9 +16,14 @@
 	fontinfo.o charinfo.o swapreq.o swaprep.o resource.o \
 	fonts.o difsutils.o cache.o initfonts.o atom.o
 
+#ifdef XorgVersion
+VENDOR_RELEASE = XorgVersion
+# define VendorReleaseDefines -DVENDOR_RELEASE='$(VENDOR_RELEASE)'
+#endif
+VENDORDEFINES = VendorDefines
 
 INCLUDES = -I../include -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(FONTLIBSRC)/include
- DEFINES = AllocateLocalDefines
+ DEFINES = AllocateLocalDefines VendorReleaseDefines VendorDefines
 #if BuildLowMem
 LOWMEMDEFINES = -DLOWMEMFTPT
 #else

Index: fonts.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xfs/difs/fonts.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/fonts.c	30 Mar 2004 14:23:16 -0000	1.1.4.4
+++ b/fonts.c	15 Apr 2004 10:17:41 -0000	1.1.4.5
@@ -46,7 +46,6 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */
 /*#define DEBUG*/
 #include        "FS.h"
 #include        "FSproto.h"