summaryrefslogtreecommitdiff
path: root/net/unison/patches
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-07-30 21:57:42 +0000
committerrillig <rillig@pkgsrc.org>2005-07-30 21:57:42 +0000
commit1d3b35f84612d68d58ab6063a7e0862c2cfcd820 (patch)
tree991d3c55bb9a57a90601c62fbd800b84108731a5 /net/unison/patches
parent95ed3bfd0ce7ffd11e4a9d56e28b596fcc81c750 (diff)
downloadpkgsrc-1d3b35f84612d68d58ab6063a7e0862c2cfcd820.tar.gz
Make pty.c always include <errno.h> in addition to <sys/errno.h>. Otherwise
errno may be undefined.
Diffstat (limited to 'net/unison/patches')
-rw-r--r--net/unison/patches/patch-ac25
1 files changed, 10 insertions, 15 deletions
diff --git a/net/unison/patches/patch-ac b/net/unison/patches/patch-ac
index 5c38bfc43ab..6e767caadaf 100644
--- a/net/unison/patches/patch-ac
+++ b/net/unison/patches/patch-ac
@@ -1,26 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2005/04/24 12:48:43 adrianp Exp $
+$NetBSD: patch-ac,v 1.3 2005/07/30 21:57:42 rillig Exp $
---- pty.c.orig 2004-09-06 20:15:47.000000000 +0100
-+++ pty.c
-@@ -18,7 +18,11 @@ CAMLprim value dumpFd(value fdVal) {
+--- pty.c.orig Mon Sep 6 21:15:47 2004
++++ pty.c Sat Jul 30 23:55:49 2005
+@@ -18,6 +18,7 @@ CAMLprim value dumpFd(value fdVal) {
}
#include <caml/fail.h> // failwith
-+#ifdef __NetBSD__
+#include <errno.h> // errno
-+#else
#include <sys/errno.h> // errno
-+#endif
#include <string.h> // strerror
#include <caml/alloc.h> // alloc_tuple
- #include <caml/memory.h> // Store_field
-@@ -32,6 +36,9 @@ CAMLprim value dumpFd(value fdVal) {
- #ifdef __APPLE__
+@@ -29,7 +30,7 @@ CAMLprim value dumpFd(value fdVal) {
+ #ifdef __linux__
+ #include <pty.h> // openpty
+ #endif
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
#include <util.h> // openpty
#endif
-+#ifdef __NetBSD__
-+#include <util.h> // openpty
-+#endif
- /* c_openpty: unit -> (int * Unix.file_descr) */
- CAMLprim value c_openpty() {