aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_addr.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-06 12:36:33 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-06 12:36:33 -0500
commit34740a17ea8145f7d308991b710e759b90a0d87b (patch)
treed760980a118c064352772c40f73189bd4812bb62 /src/test/test_addr.c
parent4268cbf29452a9851a6591ad7200468f38c8937c (diff)
downloadtor-34740a17ea8145f7d308991b710e759b90a0d87b.tar
tor-34740a17ea8145f7d308991b710e759b90a0d87b.tar.gz
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.
Diffstat (limited to 'src/test/test_addr.c')
-rw-r--r--src/test/test_addr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 4bc602df8..79ddd9509 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));