[src/trunk]: src/external/apache2/mDNSResponder/dist/mDNSShared Fix lost merges

[pettai <pettai%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/def942140d61
branches:  trunk
changeset: 794891:def942140d61
user:      pettai <pettai%NetBSD.org@localhost>
date:      Fri Mar 28 07:01:49 2014 +0000

description:
Fix lost merges

diffstat:

 external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c |  4 ++--
 external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c       |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 4c55c4a183e1 -r def942140d61 external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
--- a/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Fri Mar 28 04:09:19 2014 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c Fri Mar 28 07:01:49 2014 +0000
@@ -165,14 +165,14 @@
                        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) : "");
diff -r 4c55c4a183e1 -r def942140d61 external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
--- a/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c       Fri Mar 28 04:09:19 2014 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c       Fri Mar 28 07:01:49 2014 +0000
@@ -3256,7 +3256,9 @@
        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