X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffprintf.c;h=5ca265568778134e1df8ef8fe90e43ee735be87f;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=421ca5273f8e153f763c12b0b4399e1f008c1b2a;hpb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;p=pdclib

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index 421ca52..5ca2655 100644
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fprintf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,27 +8,28 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fprintf_unlocked( struct _PDCLIB_file_t * _PDCLIB_restrict stream, 
+int _PDCLIB_fprintf_unlocked( FILE * _PDCLIB_restrict stream, 
                       const char * _PDCLIB_restrict format, ... )
 {
     int rc;
     va_list ap;
     va_start( ap, format );
-    rc = vfprintf( stream, format, ap );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
     va_end( ap );
     return rc;
 }
 
-int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream,
+int fprintf( FILE * _PDCLIB_restrict stream,
              const char * _PDCLIB_restrict format, ... )
 {
     int rc;
     va_list ap;
     va_start( ap, format );
-    flockfile( stream );
-    rc = vfprintf_unlocked( stream, format, ap );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    _PDCLIB_funlockfile( stream );
     va_end( ap );
     return rc;
 }
@@ -38,6 +37,8 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream,
 #endif
 
 #ifdef TEST
+#include <stdint.h>
+#include <stddef.h>
 #define _PDCLIB_FILEID "stdio/fprintf.c"
 #define _PDCLIB_FILEIO