Module Name: src
Committed By: pettai
Date: Fri Mar 28 07:01:49 UTC 2014
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientstub.c
uds_daemon.c
Log Message:
Fix lost merges
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c:1.5 Mon Mar 24 00:31:13 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Fri Mar 28 07:01:49 2014
@@ -165,14 +165,14 @@ static int write_all(dnssd_sock_t sd, ch
if (getsockopt(sd, SOL_SOCKET, SO_ISDEFUNCT, &defunct, &dlen) < 0)
syslog(LOG_WARNING, "dnssd_clientstub write_all: SO_ISDEFUNCT failed %d %s", dnssd_errno, dnssd_strerror(dnssd_errno));
if (!defunct)
- syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%ld %d %s", sd,
+ syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%ld %d %s", sd,
(long)num_written, (long)len,
(num_written < 0) ? dnssd_errno : 0,
(num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
else
syslog(LOG_INFO, "dnssd_clientstub write_all(%d) DEFUNCT", sd);
#else
- syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%ld %d %s", sd,
+ syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%ld %d %s", sd,
(long)num_written, (long)len,
(num_written < 0) ? dnssd_errno : 0,
(num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.6 Mon Mar 24 00:31:13 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Fri Mar 28 07:01:49 2014
@@ -3256,7 +3256,9 @@ mDNSlocal void connect_callback(int fd,
dnssd_sockaddr_t cliaddr;
dnssd_socklen_t len = (dnssd_socklen_t) sizeof(cliaddr);
dnssd_sock_t sd = accept(fd, (struct sockaddr*) &cliaddr, &len);
-#if defined(SO_NOSIGPIPE) || defined(_WIN32)
+#if defined(SO_NOSIGPIPE)
+ int optval = 1;
+#elif defined(_WIN32)
unsigned long optval = 1;
#endif
