From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 11 Sep 2016 21:59:25 +0000 (-0400)
Subject: Whoops. Cant call sockaddr_in a "sin", since sin() is a thing.
X-Git-Tag: tor-0.2.9.3-alpha~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d29cd5a2a0e09afb199f180619cf7a5172f7f9;p=thirdparty%2Ftor.git

Whoops. Cant call sockaddr_in a "sin", since sin() is a thing.
---

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7d02fed853..1edfaa9ead 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5101,14 +5101,14 @@ is_there_a_localhost(void)
   s = tor_open_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   tor_assert(SOCKET_OK(s));
 
-  struct sockaddr_in sin;
-  memset(&sin, 0, sizeof(sin));
-  sin.sin_family = AF_INET;
-  sin.sin_addr.s_addr = htonl(0x7f000001);
-  sin.sin_port = 0;
+  struct sockaddr_in s_in;
+  memset(&s_in, 0, sizeof(s_in));
+  s_in.sin_family = AF_INET;
+  s_in.sin_addr.s_addr = htonl(0x7f000001);
+  s_in.sin_port = 0;
 
   int result = 0;
-  if (bind(s, (void*)&sin, sizeof(sin)) == 0) {
+  if (bind(s, (void*)&s_in, sizeof(s_in)) == 0) {
     result = 1;
   }
   tor_close_socket(s);