From 5b48bdb73ba85b0d20cd5c8595f85d03e4d9f257 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 17 Nov 2003 19:03:47 +0000
Subject: merge XFree86 4.3.0.1 to -CURRENT

---
 bdftopcf.c   | 11 ++++++++---
 bdftopcf.man |  7 +++++--
 2 files changed, 13 insertions(+), 5 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);
 }
diff --git a/bdftopcf.man b/bdftopcf.man
index 428cbd1..651cecc 100644
--- a/bdftopcf.man
+++ b/bdftopcf.man
@@ -22,7 +22,10 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH BDFTOPCF 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.8 2001/12/14 20:00:39 dawes Exp $
+.\"
+.TH BDFTOPCF 1 __xorgversion__
 .SH NAME
 bdftopcf \- convert X font from Bitmap Distribution Format to Portable
 Compiled Format
@@ -107,6 +110,6 @@ By default
 writes the pcf file to standard output; this option gives the name of a file
 to be used instead.
 .SH "SEE ALSO"
-X(1)
+X(__miscmansuffix__)
 .SH AUTHOR
 Keith Packard, MIT X Consortium
-- 
cgit v1.2.3