aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2019-05-25 11:06:05 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2019-05-25 11:37:38 +0300
commit2eb0a5f92d7496e36bbdcb7c1c8ba1d3a829ced0 (patch)
treed263cf128db91945e0098c399203a4918d29b04d /src/microhttpd/daemon.c
parent9da5831ce0fa14605ad15315d3ac6af74d33767c (diff)
downloadlibmicrohttpd-2eb0a5f92d7496e36bbdcb7c1c8ba1d3a829ced0.tar.gz
libmicrohttpd-2eb0a5f92d7496e36bbdcb7c1c8ba1d3a829ced0.zip
Proper detection of .sin?_len members, fixed build on *BSD
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index b2185b4c..2ee367c4 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5981,7 +5981,7 @@ MHD_start_daemon_va (unsigned int flags,
5981#ifdef IN6ADDR_ANY_INIT 5981#ifdef IN6ADDR_ANY_INIT
5982 servaddr6.sin6_addr = static_in6any; 5982 servaddr6.sin6_addr = static_in6any;
5983#endif 5983#endif
5984#if HAVE_SOCKADDR_IN_SIN_LEN 5984#if HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
5985 servaddr6.sin6_len = sizeof (struct sockaddr_in6); 5985 servaddr6.sin6_len = sizeof (struct sockaddr_in6);
5986#endif 5986#endif
5987 servaddr = (struct sockaddr *) &servaddr6; 5987 servaddr = (struct sockaddr *) &servaddr6;
@@ -5996,7 +5996,7 @@ MHD_start_daemon_va (unsigned int flags,
5996 servaddr4.sin_port = htons (port); 5996 servaddr4.sin_port = htons (port);
5997 if (0 != INADDR_ANY) 5997 if (0 != INADDR_ANY)
5998 servaddr4.sin_addr.s_addr = htonl (INADDR_ANY); 5998 servaddr4.sin_addr.s_addr = htonl (INADDR_ANY);
5999#if HAVE_SOCKADDR_IN_SIN_LEN 5999#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
6000 servaddr4.sin_len = sizeof (struct sockaddr_in); 6000 servaddr4.sin_len = sizeof (struct sockaddr_in);
6001#endif 6001#endif
6002 servaddr = (struct sockaddr *) &servaddr4; 6002 servaddr = (struct sockaddr *) &servaddr4;
@@ -6084,8 +6084,8 @@ MHD_start_daemon_va (unsigned int flags,
6084 0, 6084 0,
6085 sizeof (struct sockaddr_storage)); 6085 sizeof (struct sockaddr_storage));
6086 addrlen = sizeof (struct sockaddr_storage); 6086 addrlen = sizeof (struct sockaddr_storage);
6087#ifdef HAVE_SOCKADDR_IN_SIN_LEN 6087#ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
6088 bindaddr.sin_len = addrlen; 6088 bindaddr.ss_len = addrlen;
6089#endif 6089#endif
6090 if (0 != getsockname (listen_fd, 6090 if (0 != getsockname (listen_fd,
6091 (struct sockaddr *) &bindaddr, 6091 (struct sockaddr *) &bindaddr,