aboutsummaryrefslogtreecommitdiffstats
path: root/shells/zsh
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2011-11-13 17:56:07 +0800
committerbapt <bapt@FreeBSD.org>2011-11-13 17:56:07 +0800
commitcc050f83ac1f5376b03594aed2e17814e729d64b (patch)
treea589e94eaee84204d96ba962bfc65382318593f7 /shells/zsh
parent8c7dee0264268b339db65914581781704026250d (diff)
downloadfreebsd-ports-gnome-cc050f83ac1f5376b03594aed2e17814e729d64b.tar.gz
freebsd-ports-gnome-cc050f83ac1f5376b03594aed2e17814e729d64b.tar.zst
freebsd-ports-gnome-cc050f83ac1f5376b03594aed2e17814e729d64b.zip
- Fix build for badly upgraded systems which have both utmp.h and utmpx.h
PR: ports/156263 Submitted by: Matthew Cashdollar <matthew@cashdollar.org> Feature safe: yes
Diffstat (limited to 'shells/zsh')
-rw-r--r--shells/zsh/files/patch-Src_watch.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/shells/zsh/files/patch-Src_watch.c b/shells/zsh/files/patch-Src_watch.c
new file mode 100644
index 000000000000..c01a3632f9c1
--- /dev/null
+++ b/shells/zsh/files/patch-Src_watch.c
@@ -0,0 +1,15 @@
+--- Src/watch.c.orig 2011-11-13 10:39:47.736213000 +0100
++++ Src/watch.c 2011-11-13 10:47:22.110214518 +0100
+@@ -30,8 +30,11 @@
+ #include "zsh.mdh"
+
+ /* Headers for utmp/utmpx structures */
+-#ifdef HAVE_UTMP_H
++#if defined(HAVE_UTMP_H) && !defined(HAVE_UTMPX_H)
+ # include <utmp.h>
++#else
++# undef HAVE_STRUCT_UTMP
++# undef HAVE_STRUCT_UTMP_UT_HOST
+ #endif
+ #ifdef HAVE_UTMPX_H
+ # include <utmpx.h>