2102. [port] Silence solaris 10 warnings.

diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c
index 39617e46ca78c8dfe300efdba60dc0be0b1e0fc2..c8d1ab3b792c3e3ac5f1532b4b8429c187d74218 100644 (file)
--- a/lib/bind/irs/getaddrinfo.c
+++ b/lib/bind/irs/getaddrinfo.c
@@ -245,7 +245,7 @@ do { \
 } while (/*CONSTCOND*/0)
 
 #ifndef SOLARIS2
-#define ERR(err) \
+#define SETERROR(err) \
 do { \
        /* external reference: error, and label bad */ \
        error = (err); \
@@ -253,7 +253,7 @@ do { \
        /*NOTREACHED*/ \
 } while (/*CONSTCOND*/0)
 #else
-#define ERR(err) \
+#define SETERROR(err) \
 do { \
        /* external reference: error, and label bad */ \
        error = (err); \
@@ -352,16 +352,16 @@ getaddrinfo(hostname, servname, hints, res)
                /* error check for hints */
                if (hints->ai_addrlen || hints->ai_canonname ||
                    hints->ai_addr || hints->ai_next)
-                       ERR(EAI_BADHINTS); /* xxx */
+                       SETERROR(EAI_BADHINTS); /* xxx */
                if (hints->ai_flags & ~AI_MASK)
-                       ERR(EAI_BADFLAGS);
+                       SETERROR(EAI_BADFLAGS);
                switch (hints->ai_family) {
                case PF_UNSPEC:
                case PF_INET:
                case PF_INET6:
                        break;
                default:
-                       ERR(EAI_FAMILY);
+                       SETERROR(EAI_FAMILY);
                }
                memcpy(pai, hints, sizeof(*pai));
 
@@ -386,7 +386,7 @@ getaddrinfo(hostname, servname, hints, res)
                                        continue;
                                if (pai->ai_socktype == ex->e_socktype &&
                                    pai->ai_protocol != ex->e_protocol) {
-                                       ERR(EAI_BADHINTS);
+                                       SETERROR(EAI_BADHINTS);
                                }
                        }
                }
@@ -406,7 +406,7 @@ getaddrinfo(hostname, servname, hints, res)
        case AI_ALL:
 #if 1
                /* illegal */
-               ERR(EAI_BADFLAGS);
+               SETERROR(EAI_BADFLAGS);
 #else
                pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED);
                break;
@@ -434,7 +434,7 @@ getaddrinfo(hostname, servname, hints, res)
                }
                error = get_portmatch(pai, servname);
                if (error)
-                       ERR(error);
+                       SETERROR(error);
 
                *pai = ai0;
        }
@@ -493,9 +493,9 @@ getaddrinfo(hostname, servname, hints, res)
                goto good;
 
        if (pai->ai_flags & AI_NUMERICHOST)
-               ERR(EAI_NONAME);
+               SETERROR(EAI_NONAME);
        if (hostname == NULL)
-               ERR(EAI_NONAME);
+               SETERROR(EAI_NONAME);
 
        /*
         * hostname as alphabetical name.
@@ -803,7 +803,7 @@ explore_numeric(pai, hostname, servname, res)
                                while (cur->ai_next)
                                        cur = cur->ai_next;
                        } else
-                               ERR(EAI_FAMILY);        /*xxx*/
+                               SETERROR(EAI_FAMILY);   /*xxx*/
                }
                break;
 #endif
@@ -816,7 +816,7 @@ explore_numeric(pai, hostname, servname, res)
                                while (cur->ai_next)
                                        cur = cur->ai_next;
                        } else
-                               ERR(EAI_FAMILY);        /*xxx*/
+                               SETERROR(EAI_FAMILY);   /*xxx*/
                }
                break;
        }