check for isblank() at configuration stage. If not available

provide a suitable replacement for use in our ISBLANK macro

diff --git a/ares/configure.ac b/ares/configure.ac
index 0165c5e902263c8e9b9edb612932675068c2e65d..78f239f25e539637edd6183b88e7341569b2988b 100644 (file)
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -553,6 +553,7 @@ AC_CHECK_MEMBER(struct addrinfo.ai_flags,
 
 
 AC_CHECK_FUNCS( bitncmp \
+                isblank \
                 if_indextoname,
 dnl if found
 [],

diff --git a/ares/setup_once.h b/ares/setup_once.h
index 187f5e1b50c1dbbd71868f5c3e2334ac39563348..9d3908550add7c145ec5d881afa460588643cd6d 100644 (file)
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -115,7 +115,6 @@
  */
 
 #define ISSPACE(x)  (isspace((int)  ((unsigned char)x)))
-#define ISBLANK(x)  (isblank((int)  ((unsigned char)x)))
 #define ISDIGIT(x)  (isdigit((int)  ((unsigned char)x)))
 #define ISALNUM(x)  (isalnum((int)  ((unsigned char)x)))
 #define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
@@ -125,6 +124,13 @@
 #define ISUPPER(x)  (isupper((int)  ((unsigned char)x)))
 #define ISLOWER(x)  (islower((int)  ((unsigned char)x)))
 
+#ifdef HAVE_ISBLANK
+#define ISBLANK(x)  (isblank((int)  ((unsigned char)x)))
+#else
+#define ISBLANK(x)  (int)((((unsigned char)x) == ' ') || \
+                          (((unsigned char)x) == '\t'))
+#endif
+
 
 /*
  * Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type.

diff --git a/configure.ac b/configure.ac
index 983bf540fa69717614d98d04cfb902b8732bacc4..52efa51615ce6a192f219cce9ed25a2c2617fe8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1761,6 +1761,7 @@ AC_CHECK_FUNCS( strtoll \
                 getprotobyname \
                 getrlimit \
                 setrlimit \
+                isblank \
                 fork,
 dnl if found
 [],

diff --git a/lib/setup_once.h b/lib/setup_once.h
index 1c4d6c99cc9af3de1788a02d0ad3ccdbac594f31..827a6901e582c0a7af1c53bf85e89459f76c798d 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -122,7 +122,6 @@
  */
 
 #define ISSPACE(x)  (isspace((int)  ((unsigned char)x)))
-#define ISBLANK(x)  (isblank((int)  ((unsigned char)x)))
 #define ISDIGIT(x)  (isdigit((int)  ((unsigned char)x)))
 #define ISALNUM(x)  (isalnum((int)  ((unsigned char)x)))
 #define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
@@ -132,6 +131,13 @@
 #define ISUPPER(x)  (isupper((int)  ((unsigned char)x)))
 #define ISLOWER(x)  (islower((int)  ((unsigned char)x)))
 
+#ifdef HAVE_ISBLANK
+#define ISBLANK(x)  (isblank((int)  ((unsigned char)x)))
+#else
+#define ISBLANK(x)  (int)((((unsigned char)x) == ' ') || \
+                          (((unsigned char)x) == '\t'))
+#endif
+
 
 /*
  * Typedef to 'int' if sig_atomic_t is not an available 'typedefed' type.