svn merge file:///D:/svnrepos/vcxsrv/branches/released .

Gives currently link errors. xorg-server needs to be upgraded to.

7 files changed, 0 insertions, 70 deletions

diff --git a/libXfont/include/X11/fonts/bitmap.h b/libXfont/include/X11/fonts/bitmap.h
index 731c85f5b..9b170a90a 100644
--- a/libXfont/include/X11/fonts/bitmap.h
+++ b/libXfont/include/X11/fonts/bitmap.h
@@ -37,11 +37,7 @@ from The Open Group.
 #define _BITMAP_H_
 
 #include <X11/fonts/fntfilio.h>
-#ifndef FONTMODULE
 #include <stdio.h>  /* just for NULL */
-#else
-#include "xf86_ansic.h"
-#endif
 
 /*
  * Internal format used to store bitmap fonts
@@ -94,7 +90,6 @@ extern Bool bitmapAddInkMetrics ( FontPtr pFont );
 extern int bitmapComputeWeight ( FontPtr pFont );
 
 extern void BitmapRegisterFontFileFunctions ( void );
-extern int BitmapGetRenderIndex ( FontRendererPtr renderer );
 
 extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, 
 				int flags, FontEntryPtr entry, char *fileName,
diff --git a/libXfont/include/X11/fonts/bufio.h b/libXfont/include/X11/fonts/bufio.h
index b5977b1d0..f8e58151e 100644
--- a/libXfont/include/X11/fonts/bufio.h
+++ b/libXfont/include/X11/fonts/bufio.h
@@ -34,13 +34,6 @@ from The Open Group.
 
 #include <X11/Xfuncproto.h>
 
-#ifdef TEST
-
-#define xalloc(s)   malloc(s)
-#define xfree(s)    free(s)
-
-#endif
-
 #define BUFFILESIZE	8192
 #define BUFFILEEOF	-1
 
diff --git a/libXfont/include/X11/fonts/fntfilst.h b/libXfont/include/X11/fonts/fntfilst.h
index 1a71eae7a..407c4cf17 100644
--- a/libXfont/include/X11/fonts/fntfilst.h
+++ b/libXfont/include/X11/fonts/fntfilst.h
@@ -34,9 +34,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _FONTFILEST_H_
 #define _FONTFILEST_H_
 
-#ifndef FONTMODULE
 #include <X11/Xos.h>
-#endif
 #ifndef XP_PSTEXT
 #include <X11/fonts/fontmisc.h>
 #endif
diff --git a/libXfont/include/X11/fonts/fontconf.h.in b/libXfont/include/X11/fonts/fontconf.h.in
index f12081d22..67783d389 100644
--- a/libXfont/include/X11/fonts/fontconf.h.in
+++ b/libXfont/include/X11/fonts/fontconf.h.in
@@ -23,12 +23,6 @@
 /* Define as 1 if you have FreeType support in Xfont */
 #undef XFONT_FREETYPE
 
-/* Define as 1 if you have Type1 font support in Xfont */
-#undef XFONT_TYPE1
-
-/* Define as 1 if you have Speedo support in Xfont */
-#undef XFONT_SPEEDO
-
 /* Define as 1 if you have builtin font support in Xfont */
 #undef XFONT_BUILTINS
 
diff --git a/libXfont/include/X11/fonts/fontmisc.h b/libXfont/include/X11/fonts/fontmisc.h
index 7b8651706..ed5fd1930 100644
--- a/libXfont/include/X11/fonts/fontmisc.h
+++ b/libXfont/include/X11/fonts/fontmisc.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -34,19 +32,10 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _FONTMISC_H_
 #define _FONTMISC_H_
 
-#ifndef FONTMODULE
 #include <X11/Xfuncs.h>
 #include <stdlib.h>
 #include <stdio.h>
-
-#ifndef X_NOT_POSIX
 #include <unistd.h>
-#else
-extern int close();
-#endif
-
-#endif /* FONTMODULE */
-
 #include <X11/Xdefs.h>
 
 
@@ -68,32 +57,11 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit );
 extern int ValidAtom ( Atom atom );
 extern char *NameForAtom (Atom atom);
 
-#ifndef _HAVE_XALLOC_DECLS
-#define _HAVE_XALLOC_DECLS
-extern pointer Xalloc(unsigned long);
-extern pointer Xrealloc(pointer, unsigned long);
-extern void Xfree(pointer);
-extern pointer Xcalloc(unsigned long);
-#endif
-extern int f_strcasecmp(const char *s1, const char *s2);
-
-#ifndef xalloc
-#define xalloc(n)   Xalloc ((unsigned) n)
-#define xfree(p)    Xfree ((pointer) p)
-#define xrealloc(p,n)	Xrealloc ((pointer)p,n)
-#define xcalloc(n,s)    Xcalloc((unsigned) n * (unsigned) s)
-#endif
 #define lowbit(x) ((x) & (~(x) + 1))
 
 #undef assert
 #define assert(x)	((void)0)
 
-#ifndef strcasecmp
-#if defined(NEED_STRCASECMP) && !defined(FONTMODULE)
-#define strcasecmp(s1,s2) f_strcasecmp(s1,s2)
-#endif
-#endif
-
 extern void
 BitOrderInvert(
     register unsigned char *,
diff --git a/libXfont/include/X11/fonts/fontmod.h b/libXfont/include/X11/fonts/fontmod.h
deleted file mode 100644
index 42d277fd4..000000000
--- a/libXfont/include/X11/fonts/fontmod.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */
-
-#ifndef _FONTMOD_H_
-#define _FONTMOD_H_
-
-typedef void (*InitFont)(void);
-
-typedef struct {
-    InitFont	initFunc;
-    char *	name;
-    pointer	module;
-} FontModule;
-
-extern FontModule *FontModuleList;
-
-#endif /* _FONTMOD_H_ */
diff --git a/libXfont/include/X11/fonts/pcf.h b/libXfont/include/X11/fonts/pcf.h
index 673e18449..34bdf7bd3 100644
--- a/libXfont/include/X11/fonts/pcf.h
+++ b/libXfont/include/X11/fonts/pcf.h
@@ -94,8 +94,6 @@ typedef struct _PCFTable {
 extern int pcfReadFont ( FontPtr pFont, FontFilePtr file, 
 			 int bit, int byte, int glyph, int scan );
 extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file );
-extern int pmfReadFont ( FontPtr pFont, FontFilePtr file, 
-			 int bit, int byte, int glyph, int scan );
 extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file );
 extern void pcfError ( const char *, ... );