Thu Oct 6 10:39:34 2005 Søren Sandmann <sandmann@redhat.com>

Change several includes to be <X11/fonts/*> instead of "*". Replace
    includes of Type1 headers with copies of CID_NAME_MAX and some
    prototypes.

1 files changed, 23 insertions, 19 deletions

diff --git a/mkcfm.c b/mkcfm.c
index 67d5399..2ca5f5d 100644
--- a/mkcfm.c
+++ b/mkcfm.c
@@ -1,4 +1,4 @@
-/* From: Header: xc/programs/mkcfm/RCS/mkcfm.c,v 1.3 1996/05/08 21:38:21 ib Exp $ */
+;/* From: Header: xc/programs/mkcfm/RCS/mkcfm.c,v 1.3 1996/05/08 21:38:21 ib Exp $ */
 /* Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
  *
  * The contents of this file are subject to the CID Font Code Public Licence
@@ -25,26 +25,17 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "os.h"
+#include <X11/os.h>
 
-#include "fntfilst.h"
-#include "FSproto.h"
-#include "FS.h"
-#include "font.h"
-#include "fontenc.h"
-#include "fontstruct.h"
-#include "fsmasks.h"
-#include "range.h"
-#include "objects.h"
-#include "spaces.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/FSproto.h>
+#include <X11/fonts/FS.h>
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontenc.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/fsmasks.h>
+#include <X11/fonts/fontutil.h>
 
-#include "fontutil.h"
-#include "util.h"
-#include "fontfcn.h"
-#include "blues.h"
-#include "t1intf.h"
-#include "t1unicode.h"
- 
 static void CIDFillVals(FontScalablePtr);
 static Bool DoDirectory(char *dirName);
  
@@ -53,6 +44,19 @@ static Bool DoDirectory(char *dirName);
 #define DEFAULTRES 75
 #define DEFAULTPOINTSIZE 120
 
+/* From range.h */
+#define CID_NAME_MAX 255
+
+/* From t1intf.h */
+extern int CIDOpenScalable ( FontPathElementPtr fpe, FontPtr *ppFont,
+                             int flags, FontEntryPtr entry, char *fileName,
+                             FontScalablePtr vals, fsBitmapFormat format,
+                             fsBitmapFormatMask fmask,
+                             FontPtr non_cachable_font );
+
+/* char *unicodetoPSname(unsigned short code); */
+extern char *unicodetoPSname(unsigned short code);
+
 FontScalableRec vals;
 FontEntryRec entry;