merge with 1.11.1b

[gnulib.git] / lib / memchr.c

diff --git a/lib/memchr.c b/lib/memchr.c
index 57f9973..5114869 100644 (file)
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -33,12 +33,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define __ptr_t char *
 #endif /* C++ or ANSI C.  */
 
-#if defined (HAVE_STRING_H) || defined (_LIBC)
-# include <string.h>
-#endif
-
-#if defined (HAVE_LIMIT_H) || defined (_LIBC)
-# include <limit.h>
+#if defined (HAVE_LIMITS_H) || defined (_LIBC)
+# include <limits.h>
 #endif
 
 #define LONG_MAX_32_BITS 2147483647