diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-06 12:36:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-06 12:36:33 -0500 |
| commit | 34740a17ea8145f7d308991b710e759b90a0d87b (patch) | |
| tree | d760980a118c064352772c40f73189bd4812bb62 | |
| parent | 4268cbf29452a9851a6591ad7200468f38c8937c (diff) | |
| download | tor-34740a17ea8145f7d308991b710e759b90a0d87b.tar.gz tor-34740a17ea8145f7d308991b710e759b90a0d87b.zip | |
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.
| -rw-r--r-- | changes/bug10565 | 3 | ||||
| -rw-r--r-- | 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 0000000000..9fef9d43e7 --- /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 4bc602df84..79ddd95090 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)); |