Cleanups.

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index 667bfedc1134f5527b8c81706980b15b55b7bea6..1a90eb95dadea9780b28a024c6fb94c9bad99570 100644 (file)
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -8,10 +8,10 @@
 
 #include <stdio.h>
 
-#ifndef REGTEST
-
 #include <_PDCLIB_glue.h>
 
+#ifndef REGTEST
+
 int fgetc( struct _PDCLIB_file_t * stream )
 {
     if ( _PDCLIB_prepread( stream ) == EOF )

diff --git a/functions/stdio/fputc.c b/functions/stdio/fputc.c
index 818d45f645057fe4c93954964eb6b9d4c526e098..beff43a5aa4b34a3ab77532b3b11c8106b1d0f14 100644 (file)
--- a/functions/stdio/fputc.c
+++ b/functions/stdio/fputc.c
@@ -8,10 +8,10 @@
 
 #include <stdio.h>
 
-#ifndef REGTEST
-
 #include <_PDCLIB_glue.h>
 
+#ifndef REGTEST
+
 /* Write the value c (cast to unsigned char) to the given stream.
    Returns c if successful, EOF otherwise.
    If a write error occurs, the error indicator of the stream is set.

diff --git a/functions/stdio/fread.c b/functions/stdio/fread.c
index 53e22a65961333e51ec8cd7d3ef42f0640bef82a..b77b5dd4724d700dafdc2a242793bb8f047a705e 100644 (file)
--- a/functions/stdio/fread.c
+++ b/functions/stdio/fread.c
@@ -7,13 +7,13 @@
 */
 
 #include <stdio.h>
+#include <_PDCLIB_glue.h>
+
 #ifndef REGTEST
 
 #include <stdbool.h>
 #include <string.h>
 
-#include <_PDCLIB_glue.h>
-
 size_t fread( void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
     if ( _PDCLIB_prepread( stream ) == EOF )

diff --git a/functions/stdio/ftell.c b/functions/stdio/ftell.c
index 9ca449fe54a155d14bb747f0dca137aac8ede6c5..db9eb3dc447565acc319ae274703d2d557791339 100644 (file)
--- a/functions/stdio/ftell.c
+++ b/functions/stdio/ftell.c
@@ -44,7 +44,7 @@ int main( void )
     */
     /* The following functions delegate their tests to here:
        fgetc fflush rewind fputc ungetc fseek
-       flushbuffer seek fillbuffer
+       flushbuffer seek fillbuffer prepread prepwrite
     */
     char * buffer = (char*)malloc( 4 );
     FILE * fh;

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 9cf3cadf9586504803945f79c2699be34336a2cb..8e5db3d96b743e34f8232e51d75bd3c322bbd1d2 100644 (file)
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -7,13 +7,13 @@
 */
 
 #include <stdio.h>
+#include <_PDCLIB_glue.h>
+
 #ifndef REGTEST
 
 #include <stdbool.h>
 #include <string.h>
 
-#include <_PDCLIB_glue.h>
-
 size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
     if ( _PDCLIB_prepwrite( stream ) == EOF )