merge latest (4.3.99.16) from XFree86 (vendor) branch

5 files changed, 12 insertions, 14 deletions

diff --git a/src/stubs/errorf.c b/src/stubs/errorf.c
index 44d675c..7fdd1d5 100644
--- a/src/stubs/errorf.c
+++ b/src/stubs/errorf.c
@@ -1,9 +1,9 @@
-/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
 void
-ErrorF(char *f)
+ErrorF(const char *f, ...)
 {
 }
 
diff --git a/src/stubs/fatalerror.c b/src/stubs/fatalerror.c
index 62f571c..dbbfdd4 100644
--- a/src/stubs/fatalerror.c
+++ b/src/stubs/fatalerror.c
@@ -1,9 +1,9 @@
-/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
 void
-FatalError(char *f)
+FatalError(const char *f, ...)
 {
 }
 
diff --git a/src/stubs/initfshdl.c b/src/stubs/initfshdl.c
index 13d2230..7a7f024 100644
--- a/src/stubs/initfshdl.c
+++ b/src/stubs/initfshdl.c
@@ -1,10 +1,10 @@
-/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.2 2003/09/13 21:33:02 dawes Exp $ */
 
 #include "stubs.h"
 
 int
 init_fs_handlers(FontPathElementPtr fpe,
-                 void (*block_handler)())
+                 BlockHandlerProcPtr block_handler)
 {
   return Successful;
 }
diff --git a/src/stubs/rmfshdl.c b/src/stubs/rmfshdl.c
index 4e6d1da..1c6f650 100644
--- a/src/stubs/rmfshdl.c
+++ b/src/stubs/rmfshdl.c
@@ -1,10 +1,10 @@
-/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
+/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.2 2003/09/13 21:33:03 dawes Exp $ */
 
 #include "stubs.h"
 
 void 
 remove_fs_handlers(FontPathElementPtr fpe,
-                   void (*block_handler) (),
+                   BlockHandlerProcPtr blockHandler,
                    Bool all)
 {
 }
diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
index e88dc39..097b60c 100644
--- a/src/stubs/stubs.h
+++ b/src/stubs/stubs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */
+/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.4 2003/09/13 21:33:03 dawes Exp $ */
 
 /* This directory includes dummy entry for bdftopcf and mkfontdir */
 
@@ -15,15 +15,13 @@
 #endif
 
 extern FontPtr find_old_font ( FSID id );
-extern FontResolutionPtr GetClientResolutions ( int *num );
-extern int GetDefaultPointSize ( void );
 extern int set_font_authorizations ( char **authorizations, 
 				     int *authlen, 
 				     ClientPtr client );
-extern Bool XpClientIsBitmapClient ( ClientPtr client );
-extern Bool XpClientIsPrintClient ( ClientPtr client, 
-				    FontPathElementPtr fpe );
 
 extern unsigned long GetTimeInMillis (void);
 
+extern void ErrorF(const char *format, ...);
+extern void FatalError(const char *format, ...);
+
 /* end of file */