commit 34740a17ea8145f7d308991b710e759b90a0d87b Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 6 12:36:33 2014 -0500

Rename sun to s_un in test_addr.c

Apparently the compiler on solaris 9 didn't like "sun" as an identifier.

Fix for bug 10565; bugfix on 0.2.5.1-alpha. --- changes/bug10565 | 3 +++ src/test/test_addr.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changes/bug10565 b/changes/bug10565 new file mode 100644 index 0000000..9fef9d4 --- /dev/null +++ b/changes/bug10565 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix compilation on Solaris 9, which didn't like us to have an + identifier namd "sun". Fixes bug 10565; bugfix in 0.2.5.1-alpha. diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 4bc602d..79ddd95 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -899,7 +899,7 @@ test_addr_sockaddr_to_str(void *arg) struct sockaddr_in6 sin6; struct sockaddr_storage ss; #ifdef HAVE_SYS_UN_H - struct sockaddr_un sun; + struct sockaddr_un s_un; #endif #define CHECK(sa, s) do { \ v = tor_sockaddr_to_str((const struct sockaddr*) &(sa)); \ @@ -919,10 +919,10 @@ test_addr_sockaddr_to_str(void *arg) CHECK(sin, "127.128.128.1:1234");

#ifdef HAVE_SYS_UN_H - memset(&sun,0,sizeof(sun)); - sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, "/here/is/a/path", sizeof(sun.sun_path)); - CHECK(sun, "unix:/here/is/a/path"); + memset(&s_un,0,sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strlcpy(s_un.sun_path, "/here/is/a/path", sizeof(s_un.sun_path)); + CHECK(s_un, "unix:/here/is/a/path"); #endif

memset(&sin6,0,sizeof(sin6));