XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 34 insertions, 5 deletions

diff --git a/src/Type1/t1stdio.h b/src/Type1/t1stdio.h
index b18ac5c..d4e71e8 100644
--- a/src/Type1/t1stdio.h
+++ b/src/Type1/t1stdio.h
@@ -27,7 +27,11 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
+/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.10 2001/07/25 15:04:55 dawes Exp $ */
 /* T1IO FILE structure and related stuff */
+#ifdef XFree86LOADER
+#undef FILE
+#endif
 #define FILE F_FILE
 typedef unsigned char F_char;
  
@@ -49,11 +53,12 @@ typedef struct F_FILE {
 #define FIOERROR  (0x40)
  
 #ifndef NULL
-#define NULL 0       /* null pointer */
+#include <stddef.h>
 #endif
+
 #define EOF (-1)     /* end of file */
 #define F_BUFSIZ (512)
- 
+
 #define _XT1getc(f) \
   ( \
    ( ((f)->b_cnt > 0) && ((f)->flags == 0) ) ? \
@@ -63,6 +68,30 @@ typedef struct F_FILE {
  
 #define  T1Feof(f)          (((f)->flags & FIOEOF) && ((f)->b_cnt==0))
 
-extern FILE *T1Open(), *T1eexec();
-extern int T1Close(), T1Ungetc(), T1Read();
- 
+#ifdef BUILDCID
+extern F_FILE *CIDeexec ( FILE *f );
+#endif
+
+extern FILE *T1Open ( char *fn, char *mode );
+extern int T1Getc ( FILE *f );
+extern int T1Ungetc ( int c, FILE *f );
+extern int T1Read ( char *buffP, int size, int n, FILE *f );
+extern int T1Close ( FILE *f );
+extern FILE *T1eexec ( FILE *f );
+extern void resetDecrypt ( void );
+
+#undef fclose
+#undef fopen
+#undef ungetc
+#undef fgetc
+#undef fread
+#undef feof
+#undef ferror
+#define  fclose(f)          T1Close(f)
+#define  fopen(name,mode)   T1Open(name,mode)
+#define  ungetc(c,f)        T1Ungetc(c,f)
+#define  fgetc(f)           T1Getc(f)
+
+#define  fread(bufP,size,n,f) T1Read(bufP,size,n,f)
+#define  feof(f)            (((f)->flags & FIOEOF) && ((f)->b_cnt==0))
+#define  ferror(f)          (((f)->flags & FIOERROR)?(f)->error:0)