From 302cadd343d26cfa9b043c213c2a38de259464d8 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Mon, 2 Apr 2012 22:31:32 +0200
Subject: [PATCH] Testsuite #include fixes.

---
 ChangeLog            | 6 ++++++
 string/test-memcmp.c | 4 +++-
 string/test-strcmp.c | 4 +++-
 string/test-string.h | 3 ++-
 time/tst-mktime2.c   | 2 ++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebb7042..ca85e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-02  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* 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.
+
 	* csu/init-first.c (__libc_init_first): Call __ctype_init.
 	* sysdeps/i386/init-first.c (init): Likewise.
 	* sysdeps/mach/hurd/i386/init-first.c (posixland_init): Likewise.
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
@@ -1,5 +1,5 @@
 /* Test and measure memcmp functions.
-   Copyright (C) 1999, 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
    Added wmemcmp support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011.
@@ -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..000c510 100644
--- a/string/test-strcmp.c
+++ b/string/test-strcmp.c
@@ -1,5 +1,5 @@
 /* Test and measure strcmp and wcscmp functions.
-   Copyright (C) 1999, 2002, 2003, 2005, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
    Added wcscmp support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011.
@@ -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
@@ -1,5 +1,5 @@
 /* Test and measure string and memory functions.
-   Copyright (C) 1999, 2002, 2004, 2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
 
@@ -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..bc7cc58 100644
--- a/time/tst-mktime2.c
+++ b/time/tst-mktime2.c
@@ -1,4 +1,6 @@
 /* Test program from Paul Eggert and Tony Leneis.  */
+
+#include <limits.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
-- 
2.7.4