[Xorg-commit] xc/programs/Xserver/hw/xfree86/loader Imakefile,1.1.4.1,1.1.4.2 coffloader.c,1.1.4.1,1.1.4.2 fontsym.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/loader

Modified Files:
      Tag: XORG-CURRENT
	Imakefile coffloader.c fontsym.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/Imakefile	23 Feb 2004 21:36:43 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/loader/Imakefile,v 1.38 2003/10/02 13:30:02 eich Exp $ */
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/loader/Imakefile,v 1.39 2003/12/20 20:04:34 dawes Exp $ */
 
 
 
@@ -26,6 +26,10 @@
  COMPAT_DEFINES = -DFONTENC_COMPATIBILITY
 #endif
 
+#if BuildFontCache
+ FONTCACHE_DEFINES = -DFONTCACHE
+#endif
+
 #if HasShm
     SHM_DEFINES = -DHAS_SHM
 #endif
@@ -35,7 +39,7 @@
 #endif
 
 DEFINES = $(DBMALLOCDEFINE) $(DLOPENDEFINES) $(OS_DEFINES) $(COMPAT_DEFINES) \
-	  $(SHM_DEFINES) $(ARCHDEFINES)
+	  $(SHM_DEFINES) $(FONTCACHE_DEFINES) $(ARCHDEFINES)
 
 MODULEDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\"
 

Index: coffloader.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/coffloader.c	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/coffloader.c	23 Feb 2004 21:36:43 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.21 2003/10/15 17:40:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.22 2003/12/22 17:48:11 tsi Exp $ */
 
 /*
  *
@@ -133,7 +133,9 @@
 static LOOKUP *COFFCreateCOMMON(COFFModulePtr);
 static COFFRelocPtr COFFDelayRelocation(COFFModulePtr, int, RELOC *);
 static SYMENT *COFFGetSymbol(COFFModulePtr, int);
+#if defined(i386) || defined(__powerpc__)
 static unsigned char *COFFGetSymbolValue(COFFModulePtr, int);
+#endif
 static COFFRelocPtr COFF_RelocateEntry(COFFModulePtr, int, RELOC *);
 static LOOKUP *COFF_GetSymbols(COFFModulePtr);
 static void COFFCollectSections(COFFModulePtr);
@@ -298,6 +300,7 @@
     return (SYMENT *) (((unsigned char *)file->symtab) + (index * SYMESZ));
 }
 
+#if defined(i386) || defined(__powerpc__)
 static unsigned char *
 COFFGetSymbolValue(COFFModulePtr cofffile, int index)
 {
@@ -323,6 +326,7 @@
     xf86loaderfree(symname);
     return symval;
 }
+#endif
 
 #if defined(__powerpc__)
 /*

Index: fontsym.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/fontsym.c	26 Nov 2003 22:49:01 -0000	1.1.4.1
+++ b/fontsym.c	23 Feb 2004 21:36:43 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.13 2003/10/15 16:29:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.14 2003/12/20 20:04:34 dawes Exp $ */
 /*
  * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
  *
@@ -37,8 +37,10 @@
 #include "fntfil.h"
 #include "fontutil.h"
 #include "fontxlfd.h"
+#ifdef FONTCACHE
 #define _FONTCACHE_SERVER_
 #include "fontcache.h"
+#endif
 
 LOOKUP fontLookupTab[] = {
 
@@ -89,6 +91,7 @@
     SYMFUNC(identifyEncodingFile)
 #endif
 
+#ifdef FONTCACHE
     /* fontcache.c */
     SYMFUNC(FontCacheGetSettings)
     SYMFUNC(FontCacheGetStatistics)
@@ -99,6 +102,7 @@
     SYMFUNC(FontCacheGetEntry)
     SYMFUNC(FontCacheInsertEntry)
     SYMFUNC(FontCacheGetBitmap)
+#endif
 
     {0, 0}
 };