Reworked scanf() testing. General cleanups.

[fw/pdclib] / functions / stdio / printf.c

diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c
index aa772ec140d6d8b6647ba52c8346d7e37e45cc2c..23536dd84e145761f7c29360dd1b13e4c9f2404b 100644 (file)
--- a/functions/stdio/printf.c
+++ b/functions/stdio/printf.c
@@ -25,9 +25,8 @@ int printf( const char * _PDCLIB_restrict format, ... )
 
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/printf.c"
-#define FPRINTF_FUNCTION
-#include <limits.h>
-#include <string.h>
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
 #define testprintf( stream, format, ... ) printf( format, __VA_ARGS__ )
@@ -36,7 +35,7 @@ int main( void )
 {
     FILE * target;
     TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
-#include "printf_testcases.incl"
+#include "printf_testcases.h"
     TESTCASE( fclose( target ) == 0 );
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;