Testsuite #include fixes

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

The following test cases fail to build in a GNU Hurd configuration:

    test-memcmp.c: In function 'do_test':
    test-memcmp.c:138:61: error: 'CHAR_MAX' undeclared (first use in this function)
    test-memcmp.c:138:61: note: each undeclared identifier is reported only once for each function it appears in
    test-memcmp.c: In function 'check1':
    test-memcmp.c:429:13: error: 'CHAR_MIN' undeclared (first use in this function)
    test-memcmp.c:430:13: error: 'CHAR_MAX' undeclared (first use in this function)

    test-strcmp.c: In function 'check':
    test-strcmp.c:336:11: error: 'CHAR_MIN' undeclared (first use in this function)
    test-strcmp.c:336:11: note: each undeclared identifier is reported only once for each function it appears in
    test-strcmp.c:337:11: error: 'CHAR_MAX' undeclared (first use in this function)

    tst-mktime2.c: In function 'do_test':
    tst-mktime2.c:132:24: error: 'INT_MAX' undeclared (first use in this function)
    tst-mktime2.c:132:24: note: each undeclared identifier is reported only once for each function it appears in

    [glibc].build-gcc-4.6-486/string/test-memmem.o: In function `do_random_tests':
    [glibc]/string/test-memmem.c:123: undefined reference to `MIN'
    [glibc]/string/test-memmem.c:125: undefined reference to `MIN'

    [glibc].build-gcc-4.6-486/string/test-strnlen.o: In function `do_test':
    [glibc]/string/test-strnlen.c:87: undefined reference to `MIN'

OK to commit the following?

	* string/test-memcmp.c [! WIDE]: #include <limits.h> for CHAR_MIN,
	CHAR_MAX.
	* string/test-strcmp.c [! WIDE]: Likewise.
	* time/tst-mktime2.c: Likewise for INT_MAX.
	* string/test-string.h: #include <sys/param.h> for MIN.

diff --git a/string/test-memcmp.c b/string/test-memcmp.c
index 2e61f59..69076d0 100644
--- a/string/test-memcmp.c
+++ b/string/test-memcmp.c
@@ -44,6 +44,8 @@ simple_wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n)
   return ret;
 }
 #else
+# include <limits.h>
+
 # define MEMCMP memcmp
 # define MEMCPY memcpy
 # define SIMPLE_MEMCMP simple_memcmp
diff --git a/string/test-strcmp.c b/string/test-strcmp.c
index 85df6dc..080de6f 100644
--- a/string/test-strcmp.c
+++ b/string/test-strcmp.c
@@ -80,6 +80,8 @@ stupid_wcscmp (const wchar_t *s1, const wchar_t *s2)
 }
 
 #else
+# include <limits.h>
+
 # define L(str) str
 # define STRCMP strcmp
 # define STRCPY strcpy
diff --git a/string/test-string.h b/string/test-string.h
index 40fec18..c94d822 100644
--- a/string/test-string.h
+++ b/string/test-string.h
@@ -44,6 +44,7 @@ extern impl_t __start_impls[], __stop_impls[];
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <sys/param.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <error.h>
diff --git a/time/tst-mktime2.c b/time/tst-mktime2.c
index 0e4fd1e..494b91e 100644
--- a/time/tst-mktime2.c
+++ b/time/tst-mktime2.c
@@ -1,4 +1,5 @@
 /* Test program from Paul Eggert and Tony Leneis.  */
+#include <limits.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature