Tightening the code a bit.

diff --git a/Makefile b/Makefile
index da30ee5d9150cad6943fdafdd0fe605bcab2e434..f1cf050c62ff1d00617bffa926eee7a253e9a552 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 # This is where you chose which platform to compile for (see 'make links' / './platform')
-PLATFORM := example
+PLATFORM := example_cygwin
 
 # This is a list of all non-source files that are part of the distribution.
 AUXFILES := Makefile Readme.txt

diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c
index b5a32572158fd89dc2875d65dfca75407073d231..29522c1d64ee50d917b963a26ae12e082a2fd5c5 100644 (file)
--- a/functions/stdio/fgetc.c
+++ b/functions/stdio/fgetc.c
@@ -8,10 +8,10 @@
 
 #include <stdio.h>
 
-#include <_PDCLIB_glue.h>
-
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 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 beff43a5aa4b34a3ab77532b3b11c8106b1d0f14..818d45f645057fe4c93954964eb6b9d4c526e098 100644 (file)
--- a/functions/stdio/fputc.c
+++ b/functions/stdio/fputc.c
@@ -8,10 +8,10 @@
 
 #include <stdio.h>
 
-#include <_PDCLIB_glue.h>
-
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 /* 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 51e6a7b37a5d8766134dc581e395808d4a2b57de..52abb73478e05ea19597afb229695e3631164393 100644 (file)
--- a/functions/stdio/fread.c
+++ b/functions/stdio/fread.c
@@ -7,10 +7,11 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 #include <stdbool.h>
 #include <string.h>
 

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 4eabd22943db112e85f8cc07f2cf1ff83b909a72..8b40551d6598d2ee780f07535d814f798b2c64be 100644 (file)
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -7,10 +7,11 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 #include <stdbool.h>
 #include <string.h>
 

diff --git a/testing/scanf_testcases.h b/testing/scanf_testcases.h
index 4cb662ea7a7038f8ebd76fdb1b2200dc5d946fd2..f8d3b0f84f3f6e060acf493026cb1e5c544c9cf5 100644 (file)
--- a/testing/scanf_testcases.h
+++ b/testing/scanf_testcases.h
@@ -1,8 +1,5 @@
 {
     char buffer[100];
-#ifndef TEST_CONVERSION_ONLY
-    SCANF_TEST( 0, "foo", "foo", NULL );
-#endif
     SCANF_TEST( 1, "foo", "%3c", buffer );
     TESTCASE( memcmp( buffer, "foo", 3 ) == 0 );
 }