use our own ISUPPER and ISLOWER macros

diff --git a/inet_net_pton.c b/inet_net_pton.c
index 8c78a0b..49bac69 100644 (file)
--- a/inet_net_pton.c
+++ b/inet_net_pton.c
@@ -86,7 +86,7 @@ inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
     dirty = 0;
     src++;  /* skip x or X. */
     while ((ch = *src++) != '\0' && ISXDIGIT(ch)) {
-      if (isupper(ch))
+      if (ISUPPER(ch))
         ch = tolower(ch);
       n = (int)(strchr(xdigits, ch) - xdigits);
       if (dirty == 0)

diff --git a/setup_once.h b/setup_once.h
index 6cfa526..187f5e1 100644 (file)
--- a/setup_once.h
+++ b/setup_once.h
@@ -122,6 +122,8 @@
 #define ISGRAPH(x)  (isgraph((int)  ((unsigned char)x)))
 #define ISALPHA(x)  (isalpha((int)  ((unsigned char)x)))
 #define ISPRINT(x)  (isprint((int)  ((unsigned char)x)))
+#define ISUPPER(x)  (isupper((int)  ((unsigned char)x)))
+#define ISLOWER(x)  (islower((int)  ((unsigned char)x)))
 
 
 /*

diff --git a/windows_port.c b/windows_port.c
index 2d84274..dabe0bc 100644 (file)
--- a/windows_port.c
+++ b/windows_port.c
@@ -41,8 +41,8 @@ ares_strncasecmp(const char *a, const char *b, int n)
     int i;
 
     for (i = 0; i < n; i++) {
-        int c1 = isupper(a[i]) ? tolower(a[i]) : a[i];
-        int c2 = isupper(b[i]) ? tolower(b[i]) : b[i];
+        int c1 = ISUPPER(a[i]) ? tolower(a[i]) : a[i];
+        int c2 = ISUPPER(b[i]) ? tolower(b[i]) : b[i];
         if (c1 != c2) return c1-c2;
     }
     return 0;