- (djm) Fix my breaking of cygwin builds, Patch from Corinna Vinschen

   <vinschen@redhat.com> and myself.

diff --git a/ChangeLog b/ChangeLog
index e1ba9285824b18ba820bdf1f3c44120e0bb816d7..aadacf2b80d4e5549364f055f781ab4bde128799 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    <tim@multitalents.net> 
  - (Bal) Patch for lack of RA_RESTART in misc.c for mysignal by
    stevesk
+ - (djm) Fix my breaking of cygwin builds, Patch from Corinna Vinschen 
+   <vinschen@redhat.com> and myself.
 
 20010217
  - (bal) OpenBSD Sync:

diff --git a/Makefile.in b/Makefile.in
index 174ee1acb1a6e377c6a71f2558f2326315cb3af0..8ca00299f26740b4b9c75f1e01cacb9307fab70f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ PATHS= -DETCDIR=\"$(sysconfdir)\" \
 CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@
+CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/openbsd-compat $(PATHS) @DEFS@
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@

diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 79ea907daccc867ea4975333cc074ec334f58688..3d8696d16ba3403e9c6999c9b367fe002fddd780 100644 (file)
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -26,8 +26,21 @@ RCSID("$Id$");
 #include <windows.h>
 #define is_winnt       (GetVersion() < 0x80000000)
 
-int binary_open(const char *filename, int flags, mode_t mode)
+#if defined(open) && open == binary_open
+# undef open
+#endif
+#if defined(pipe) && open == binary_pipe
+# undef pipe
+#endif
+
+int binary_open(const char *filename, int flags, ...)
 {
+       va_list ap;
+       mode_t mode;
+       
+       va_start(ap, flags);
+       mode = va_arg(ap, mode_t);
+       va_end(ap);
        return open(filename, flags | O_BINARY, mode);
 }
 

diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 0a9f44db09caadaa6f0569f13a598b985e4bf29b..9a0385199abf7d012481f635a094c0f5fed242da 100644 (file)
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -15,7 +15,8 @@
 
 /* $Id$ */
 
-#include "config.h"
+#ifndef _BSD_CYGWIN_UTIL_H
+#define _BSD_CYGWIN_UTIL_H
 
 #ifdef HAVE_CYGWIN
 
@@ -28,3 +29,5 @@ int check_ntsec(const char *filename);
 #define pipe binary_pipe
 
 #endif /* HAVE_CYGWIN */
+
+#endif /* _BSD_CYGWIN_UTIL_H */