2499. [port] solaris: lib/lwres/getaddrinfo.c namespace clash.

                        [RT #18837]

diff --git a/CHANGES b/CHANGES
index a976c458ee5387bec1e19a258d839299fd333702..c6a9b9809784bf2fa891f14681f507fe1ffd7799 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2499.  [port]          solaris: lib/lwres/getaddrinfo.c namespace clash.
+                       [RT #18837]
+
 2498.  [bug]           Removed a bogus function argument used with
                        ISC_SOCKET_USE_POLLWATCH: it could cause compiler
                        warning or crash named with the debug 1 level

diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c
index 6056f24c6e657570041f94cf8c345069b94a9eb4..d0f979936b1f4050aac477c5810d5462c258ee8b 100644 (file)
--- a/lib/lwres/getaddrinfo.c
+++ b/lib/lwres/getaddrinfo.c
@@ -18,7 +18,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddrinfo.c,v 1.43.18.8 2007/09/13 23:46:26 tbox Exp $ */
+/* $Id: getaddrinfo.c,v 1.43.18.9 2008/11/25 05:45:48 marka Exp $ */
 
 /*! \file */
 
@@ -145,7 +145,7 @@
 #define SA(addr)       ((struct sockaddr *)(addr))
 #define SIN(addr)      ((struct sockaddr_in *)(addr))
 #define SIN6(addr)     ((struct sockaddr_in6 *)(addr))
-#define SUN(addr)      ((struct sockaddr_un *)(addr))
+#define SLOCAL(addr)   ((struct sockaddr_un *)(addr))
 
 /*! \struct addrinfo
  */
@@ -709,17 +709,17 @@ lwres_freeaddrinfo(struct addrinfo *ai) {
 static int
 get_local(const char *name, int socktype, struct addrinfo **res) {
        struct addrinfo *ai;
-       struct sockaddr_un *sun;
+       struct sockaddr_un *slocal;
 
        if (socktype == 0)
                return (EAI_SOCKTYPE);
 
-       ai = ai_alloc(AF_LOCAL, sizeof(*sun));
+       ai = ai_alloc(AF_LOCAL, sizeof(*slocal));
        if (ai == NULL)
                return (EAI_MEMORY);
 
-       sun = SUN(ai->ai_addr);
-       strncpy(sun->sun_path, name, sizeof(sun->sun_path));
+       slocal = SLOCAL(ai->ai_addr);
+       strncpy(slocal->sun_path, name, sizeof(slocal->sun_path));
 
        ai->ai_socktype = socktype;
        /*