1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- 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
This commit is contained in:
Baptiste Daroussin 2011-11-13 09:56:07 +00:00
parent 0054d42623
commit f5e4192337
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=285690

View File

@ -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>