From 9cc6ab39220c60ee59eaae8b207216c0a319d384 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 14 Apr 2009 13:50:32 +0000
Subject: use HAVE_LIMITS_H symbol to protect limits.h inclusion

---
 ares/ares_parse_a_reply.c    | 5 ++++-
 ares/ares_parse_aaaa_reply.c | 5 ++++-
 ares/ares_writev.c           | 5 ++++-
 ares/config-win32.h          | 3 +++
 ares/configure.ac            | 1 +
 lib/config-win32.h           | 3 +++
 lib/config-win32ce.h         | 3 +++
 lib/hostares.c               | 4 +++-
 lib/qssl.c                   | 4 +++-
 lib/ssh.c                    | 4 +++-
 lib/ssluse.c                 | 2 ++
 11 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index b8d98d43c..c2d809f2c 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -44,7 +44,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
+
 #include "ares.h"
 #include "ares_dns.h"
 #include "ares_private.h"
diff --git a/ares/ares_parse_aaaa_reply.c b/ares/ares_parse_aaaa_reply.c
index 60f8f851b..0624161a2 100644
--- a/ares/ares_parse_aaaa_reply.c
+++ b/ares/ares_parse_aaaa_reply.c
@@ -44,7 +44,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
+
 #include "ares.h"
 #include "ares_dns.h"
 #include "inet_net_pton.h"
diff --git a/ares/ares_writev.c b/ares/ares_writev.c
index 045373b63..96cf543dc 100644
--- a/ares/ares_writev.c
+++ b/ares/ares_writev.c
@@ -18,7 +18,10 @@
 
 #include "setup.h"
 
-#include <limits.h>
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
+
 #include "ares.h"
 #include "ares_private.h"
 
diff --git a/ares/config-win32.h b/ares/config-win32.h
index f28125581..e8c5d72a4 100644
--- a/ares/config-win32.h
+++ b/ares/config-win32.h
@@ -29,6 +29,9 @@
 #define HAVE_GETOPT_H 1
 #endif
 
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
 /* Define if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
diff --git a/ares/configure.ac b/ares/configure.ac
index ce66b8530..67dc00771 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -448,6 +448,7 @@ AC_CHECK_HEADERS(
        strings.h \
        stdbool.h \
        time.h \
+       limits.h \
        arpa/nameser.h \
        arpa/nameser_compat.h \
        arpa/inet.h,
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 6e37a3c75..1318d2978 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -30,6 +30,9 @@
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
 
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
 /* Define if you need the malloc.h header file even with stdlib.h  */
 #ifndef __SALFORDC__
 #define NEED_MALLOC_H 1
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 69caa4666..57571b51f 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -30,6 +30,9 @@
 /* Define if you have the <io.h> header file.  */
 #define HAVE_IO_H 1
 
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
 /* Define if you need the malloc.h header header file even with stdlib.h  */
 #define NEED_MALLOC_H 1
 
diff --git a/lib/hostares.c b/lib/hostares.c
index b6af96f83..1198ac7d9 100644
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -24,8 +24,10 @@
 #include "setup.h"
 
 #include <string.h>
-#include <limits.h>
 
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 #ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
diff --git a/lib/qssl.c b/lib/qssl.c
index f2de800c5..a855f4a0c 100644
--- a/lib/qssl.c
+++ b/lib/qssl.c
@@ -27,7 +27,9 @@
 #include <qsossl.h>
 #include <errno.h>
 #include <string.h>
-#include <limits.h>
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
 
 #include <curl/curl.h>
 #include "urldata.h"
diff --git a/lib/ssh.c b/lib/ssh.c
index 6980c81b5..142da39bd 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -31,7 +31,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <limits.h>
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
 
 #include <libssh2.h>
 #include <libssh2_sftp.h>
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 3887f9502..821ec420c 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -36,7 +36,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-- 
cgit v1.2.3