torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename sun to s_un in test_addr.c

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

Fix for bug 10565; bugfix on 0.2.5.1-alpha.
This commit is contained in:
Nick Mathewson
2014-02-06 12:36:33 -05:00
parent 4268cbf294
commit 34740a17ea
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug10565
+3
View File
@@ -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.
src/test/test_addr.c
+5 -5
View File
@@ -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));