[xlibs-commit] Xfont/bitmap pcf.h,1.4,1.5 pcfread.c,1.21,1.22 pcfwrite.c,1.10,1.11

[Keith Packard]

Committed by: keithp

Update of /cvs/xlibs/Xfont/bitmap
In directory pdx:/tmp/cvs-serv22649/bitmap

Modified Files:
	pcf.h pcfread.c pcfwrite.c 
Log Message:
	* bitmap/pcf.h:
	* bitmap/pcfread.c: (pcfError):
	* bitmap/pcfwrite.c:
	export pcfError (used by pcfRead and pcfWrite)


Index: pcf.h
===================================================================
RCS file: /cvs/xlibs/Xfont/bitmap/pcf.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pcf.h	14 Dec 2001 19:56:47 -0000	1.4
+++ pcf.h	1 Nov 2003 03:47:29 -0000	1.5
@@ -95,5 +95,6 @@
 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(char* message, ...);
 
 #endif				/* _PCF_H_ */

Index: pcfread.c
===================================================================
RCS file: /cvs/xlibs/Xfont/bitmap/pcfread.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pcfread.c	29 Oct 2003 16:11:40 -0000	1.21
+++ pcfread.c	1 Nov 2003 03:47:29 -0000	1.22
@@ -46,14 +46,8 @@
 #include <varargs.h>
 #endif
 
-static void
-#if NeedVarargsPrototypes
+void
 pcfError(char* message, ...)
-#else
-pcfError (message, va_alist)
-    char* message;
-    va_dcl
-#endif
 {
     va_list args;
 

Index: pcfwrite.c
===================================================================
RCS file: /cvs/xlibs/Xfont/bitmap/pcfwrite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pcfwrite.c	12 Jan 2003 03:55:46 -0000	1.10
+++ pcfwrite.c	1 Nov 2003 03:47:29 -0000	1.11
@@ -37,12 +37,6 @@
 #include "bitmap.h"
 #include "pcf.h"
 
-extern void pcfError(
-#if NeedVarargsPrototypes
-		     char* message, ...
-#endif
-		    );
-
 /* Write PCF font files */
 
 static CARD32  current_position;