From 1a6043f94e906b20ba06a5494eee19798cd95d07 Mon Sep 17 00:00:00 2001
Message-Id: <1a6043f94e906b20ba06a5494eee19798cd95d07.1714777269.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 14 Sep 2005 23:07:55 +0000
Subject: [PATCH] Fix for Cygwin.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 Makefile.am  | 4 ++--
 configure.in | 4 ++--
 fdpass.c     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e775c57..e5c1f1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,13 +75,13 @@ libmLib_la_LIBADD = @DEPLIBS@
 
 BUILT_SOURCES = crc32-tab.c unihash-global.c
 
-crc32-tab.c: crc-mktab
+crc32-tab.c: crc-mktab$(EXEEXT)
 	./crc-mktab \
 		-p0x04c11db7 -b32 -B8 -r \
 		-c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c.new
 	mv crc32-tab.c.new crc32-tab.c
 
-unihash-global.c: unihash-mkstatic
+unihash-global.c: unihash-mkstatic$(EXEEXT)
 	./unihash-mkstatic \
 		-c -sunihash_global -iunihash.h -ounihash-global.c.new
 	mv unihash-global.c.new unihash-global.c
diff --git a/configure.in b/configure.in
index f618c32..6dfd734 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.38 2004/04/08 01:36:11 mdw Exp $
+dnl $Id$
 dnl
 dnl Configuration script for mLib
 dnl
@@ -40,7 +40,7 @@ mdw_CHECK_MANYLIBS(socket, socket)
 mdw_CHECK_MANYLIBS(gethostbyname, nsl resolv)
 
 DEPLIBS=$LIBS AC_SUBST(DEPLIBS)
-BRES_LIBEXEC="bres" BRES_SOURCE="bres"
+BRES_LIBEXEC="bres\$(EXEEXT)" BRES_SOURCE="bres"
 AC_SUBST(BRES_LIBEXEC) AC_SUBST(BRES_SOURCE)
 AC_ARG_WITH(adns,
 [  --with-adns             use ADNS library for background name resolution],
diff --git a/fdpass.c b/fdpass.c
index 30808b4..0a11c2c 100644
--- a/fdpass.c
+++ b/fdpass.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: fdpass.c,v 1.2 2004/04/08 01:36:11 mdw Exp $
+ * $Id$
  *
  * File descriptor passing
  *
@@ -74,11 +74,11 @@ ssize_t fdpass_send(int sock, int fd, const void *p, size_t sz)
   msg.msg_namelen = 0;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
-  msg.msg_flags = 0;
 #ifdef HAVE_MSG_ACCRIGHTS
   msg.msg_accrights = &fd;
   msg.msg_accrightslen = sizeof(fd);
 #else  
+  msg.msg_flags = 0;
   msg.msg_control = buf;
   msg.msg_controllen = sizeof(buf);
   cmsg = CMSG_FIRSTHDR(&msg);
@@ -122,11 +122,11 @@ ssize_t fdpass_recv(int sock, int *fd, void *p, size_t sz)
   msg.msg_namelen = 0;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
-  msg.msg_flags = 0;
 #ifdef HAVE_MSG_ACCRIGHTS
   msg.msg_accrights = fd;
   msg.msg_accrightslen = sizeof(*fd);
 #else
+  msg.msg_flags = 0;
   msg.msg_control = buf;
   msg.msg_controllen = sizeof(buf);
 #endif
-- 
[mdw]