X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffgetc.c;h=0b042c7d5be8506396f43f61a19b144570caa024;hp=61f52fdd4208a84a3000a1e937619d92191b85b7;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=b852731d2bc40ce2208264cdb55cc8e27944c890

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index 61f52fd..0b042c7 100644
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fgetc( FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,10 +7,9 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
 
-#include <_PDCLIB_glue.h>
-
-int fgetc_unlocked( struct _PDCLIB_file_t * stream )
+int _PDCLIB_fgetc_unlocked( FILE * stream )
 {
     if ( _PDCLIB_prepread( stream ) == EOF )
     {
@@ -26,18 +23,18 @@ int fgetc_unlocked( struct _PDCLIB_file_t * stream )
     return n == 0 ? EOF : (unsigned char) c;
 }
 
-int fgetc( struct _PDCLIB_file_t * stream )
+int fgetc( FILE * stream )
 {
-    flockfile( stream );
-    int c = fgetc_unlocked( stream );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    int c = _PDCLIB_fgetc_unlocked( stream );
+    _PDCLIB_funlockfile( stream );
     return c;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {