diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | conform/conformtest.pl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8783f6b5d3..5a8a2ceb06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-01-26 Ulrich Drepper <drepper@redhat.com> + * conform/conformtest.pl: Fix handling of macro-str. + * conform/data/inttypes.h-data: Add missing definition and all of stdint.h-data. diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 69dcf7f1dd..6aade40c55 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -694,7 +694,7 @@ while ($#headers >= 0) { compiletest ($fnamebase, "Test for type of function $fname", "Function \"$fname\" has incorrect type.", $res, 0); - } elsif (/^macro-str *([^ ]*)\s*(\".*\")/) { + } elsif (/^macro-str *([^ ]*) *(\".*\")/) { # The above regex doesn't handle a \" in a string. my($macro) = "$1"; my($string) = "$2"; @@ -721,7 +721,7 @@ while ($#headers >= 0) { print TESTFILE "#include <$h>\n"; # We can't include <string.h> here. print TESTFILE "extern int (strcmp)(const char *, const char *);\n"; - print TESTFILE "int main (void) { return strcmp ($macro, $string) != 0;}\n"; + print TESTFILE "int main (void) { return (strcmp) ($macro, $string) != 0;}\n"; close (TESTFILE); $res = runtest ($fnamebase, "Testing for value of macro $macro", |