Update to libXfont 1.4.3. No functional change.

12 files changed, 4 insertions, 30 deletions

diff --git a/lib/libXfont/include/X11/fonts/bdfint.h b/lib/libXfont/include/X11/fonts/bdfint.h
index d41c4a556..913f660df 100644
--- a/lib/libXfont/include/X11/fonts/bdfint.h
+++ b/lib/libXfont/include/X11/fonts/bdfint.h
@@ -1,5 +1,3 @@
-/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
 
 #ifndef BDFINT_H
 #define BDFINT_H
diff --git a/lib/libXfont/include/X11/fonts/bitmap.h b/lib/libXfont/include/X11/fonts/bitmap.h
index 9b170a90a..c02342759 100644
--- a/lib/libXfont/include/X11/fonts/bitmap.h
+++ b/lib/libXfont/include/X11/fonts/bitmap.h
@@ -1,5 +1,3 @@
-/* $Xorg: bitmap.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/bufio.h b/lib/libXfont/include/X11/fonts/bufio.h
index f8e58151e..e7a9f4a35 100644
--- a/lib/libXfont/include/X11/fonts/bufio.h
+++ b/lib/libXfont/include/X11/fonts/bufio.h
@@ -1,5 +1,3 @@
-/* $Xorg: bufio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1993, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */
 
 #ifndef ___BUFIO_H___
 #define ___BUFIO_H___ 1
diff --git a/lib/libXfont/include/X11/fonts/fntfil.h b/lib/libXfont/include/X11/fonts/fntfil.h
index 81d2cbc3d..25d1f3054 100644
--- a/lib/libXfont/include/X11/fonts/fntfil.h
+++ b/lib/libXfont/include/X11/fonts/fntfil.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfil.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
@@ -92,6 +89,9 @@ extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
 extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, 
 			       char *pat, int len, int max, 
 			       FontNamesPtr names );
+extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, 
+				    char *pat, int len, int max, 
+				    pointer *privatep, int mark_aliases );
 extern int FontFileStartListFontsWithInfo ( pointer client, 
 					    FontPathElementPtr fpe, 
 					    char *pat, int len, int max, 
@@ -111,6 +111,7 @@ extern int FontFileListNextFontOrAlias ( pointer client,
 					 char **resolvedp, int *resolvedlenp, 
 					 pointer private );
 extern void FontFileRegisterLocalFpeFunctions ( void );
+extern void CatalogueRegisterLocalFpeFunctions ( void );
 
 
 extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, 
diff --git a/lib/libXfont/include/X11/fonts/fntfilio.h b/lib/libXfont/include/X11/fonts/fntfilio.h
index f8e24f390..3a8f4ca35 100644
--- a/lib/libXfont/include/X11/fonts/fntfilio.h
+++ b/lib/libXfont/include/X11/fonts/fntfilio.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fntfilst.h b/lib/libXfont/include/X11/fonts/fntfilst.h
index 407c4cf17..29e0a56fb 100644
--- a/lib/libXfont/include/X11/fonts/fntfilst.h
+++ b/lib/libXfont/include/X11/fonts/fntfilst.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilst.h,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fontencc.h b/lib/libXfont/include/X11/fonts/fontencc.h
index 51e0e1440..987cbfbed 100644
--- a/lib/libXfont/include/X11/fonts/fontencc.h
+++ b/lib/libXfont/include/X11/fonts/fontencc.h
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86$ */
 
 /* Binary compatibility entry points. */
 
diff --git a/lib/libXfont/include/X11/fonts/fontmisc.h b/lib/libXfont/include/X11/fonts/fontmisc.h
index ed5fd1930..cd9d52a64 100644
--- a/lib/libXfont/include/X11/fonts/fontmisc.h
+++ b/lib/libXfont/include/X11/fonts/fontmisc.h
@@ -23,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fontshow.h b/lib/libXfont/include/X11/fonts/fontshow.h
index 5bb48fe18..126cab698 100644
--- a/lib/libXfont/include/X11/fonts/fontshow.h
+++ b/lib/libXfont/include/X11/fonts/fontshow.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontshow.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
diff --git a/lib/libXfont/include/X11/fonts/fontutil.h b/lib/libXfont/include/X11/fonts/fontutil.h
index 9a73eaa47..71d507b1a 100644
--- a/lib/libXfont/include/X11/fonts/fontutil.h
+++ b/lib/libXfont/include/X11/fonts/fontutil.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */
-
 #ifndef _FONTUTIL_H_
 #define _FONTUTIL_H_
 
diff --git a/lib/libXfont/include/X11/fonts/fontxlfd.h b/lib/libXfont/include/X11/fonts/fontxlfd.h
index e87b93143..3555706e6 100644
--- a/lib/libXfont/include/X11/fonts/fontxlfd.h
+++ b/lib/libXfont/include/X11/fonts/fontxlfd.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontxlfd.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1994, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/pcf.h b/lib/libXfont/include/X11/fonts/pcf.h
index 34bdf7bd3..a5fdbcd01 100644
--- a/lib/libXfont/include/X11/fonts/pcf.h
+++ b/lib/libXfont/include/X11/fonts/pcf.h
@@ -1,5 +1,3 @@
-/* $Xorg: pcf.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium