]> granicus.if.org Git - libevent/commitdiff
Fix IRIX build. sa_family collides with a #define in sys/socket.h on IRIX.
authorKevin Bowling <kevin.bowling@kev009.com>
Mon, 22 Nov 2010 23:40:31 +0000 (16:40 -0700)
committerKevin Bowling <kevin.bowling@kev009.com>
Mon, 22 Nov 2010 23:40:31 +0000 (16:40 -0700)
test/regress_util.c

index fc263bcffca8e46c40e3d21f6f5e31e6ba8cc6b7..f31bb4a24a258ec49634812b2b6d244974f1bae1 100644 (file)
@@ -206,7 +206,7 @@ regress_ipv6_parse(void *ptr)
 
 static struct sa_port_ent {
        const char *parse;
-       int sa_family;
+       int safamily;
        const char *addr;
        int port;
 } sa_port_ents[] = {
@@ -235,14 +235,14 @@ regress_sockaddr_port_parse(void *ptr)
                memset(&ss, 0, sizeof(ss));
                r = evutil_parse_sockaddr_port(ent->parse, (struct sockaddr*)&ss, &len);
                if (r < 0) {
-                       if (ent->sa_family)
+                       if (ent->safamily)
                                TT_FAIL(("Couldn't parse %s!", ent->parse));
                        continue;
-               } else if (! ent->sa_family) {
+               } else if (! ent->safamily) {
                        TT_FAIL(("Shouldn't have been able to parse %s!", ent->parse));
                        continue;
                }
-               if (ent->sa_family == AF_INET) {
+               if (ent->safamily == AF_INET) {
                        struct sockaddr_in sin;
                        memset(&sin, 0, sizeof(sin));
 #ifdef _EVENT_HAVE_STRUCT_SOCKADDR_IN_SIN_LEN