merge XFree86 4.3.0.1 to -CURRENTXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

1 files changed, 8 insertions, 3 deletions

diff --git a/bdftopcf.c b/bdftopcf.c
index 4e1d6d6..cb82abd 100644
--- a/bdftopcf.c
+++ b/bdftopcf.c
@@ -27,16 +27,21 @@ from The Open Group.
 
 */
 
+/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.5 2001/12/14 20:00:39 dawes Exp $ */
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "fontmisc.h"
 #include "fontstruct.h"
 #include "fntfilio.h"
+#include "fntfil.h"
+#include "bdfint.h"
+#include "pcf.h"
 #include <stdio.h>
 #include <X11/Xos.h>
 
-main (argc, argv)
-    char    **argv;
+int
+main (int argc, char *argv[])
 {
     FontRec font;
     FontFilePtr	input, output;
@@ -186,5 +191,5 @@ main (argc, argv)
     }
     else
 	FontFileClose (output);
-    exit (0);
+    return (0);
 }