From d6a61cf079d469e300ff3def412440d57361c827 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 14 Nov 2015 12:18:01 -0800 Subject: [PATCH] Fix a build failure in dbgport when using clang modules xhyve/src/dbgport.c:51:27: error: redefinition of 'sin' as different kind of symbol static struct sockaddr_in sin; ^ In module 'Darwin' imported from xhyve/src/dbgport.c:30: /usr/include/math.h:343:15: note: previous definition is here extern double sin(double); ^ xhyve/src/dbgport.c:126:2: warning: implicitly declaring library function 'sin' with type 'double (double)' sin.sin_len = sizeof(sin); ^ xhyve/src/dbgport.c:126:2: note: include the header or explicitly provide a declaration for 'sin' Signed-off-by: Jeremy Huddleston Sequoia --- src/dbgport.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dbgport.c b/src/dbgport.c index 54c968d..9ec552e 100644 --- a/src/dbgport.c +++ b/src/dbgport.c @@ -48,7 +48,7 @@ static int listen_fd, conn_fd; -static struct sockaddr_in sin; +static struct sockaddr_in saddrin; static int dbg_handler(UNUSED int vcpu, int in, UNUSED int port, int bytes, uint32_t *eax, @@ -123,12 +123,12 @@ init_dbgport(int sport) exit(1); } - sin.sin_len = sizeof(sin); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(INADDR_ANY); - sin.sin_port = htons(sport); + saddrin.sin_len = sizeof(saddrin); + saddrin.sin_family = AF_INET; + saddrin.sin_addr.s_addr = htonl(INADDR_ANY); + saddrin.sin_port = htons(sport); - if (bind(listen_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { + if (bind(listen_fd, (struct sockaddr *)&saddrin, sizeof(saddrin)) < 0) { perror("bind"); exit(1); }