aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/includes.h
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2004-10-28 16:11:31 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2004-10-28 16:11:31 +0000
commit21e764df0c8084af2d7d6f5ecdaa136ad81246ed (patch)
tree2b93d7eeb78a97c2cc9e93d61346f39150ed165f /crypto/openssh/includes.h
parent5ba618aa27e6a84eb699b91af11a162d24082f30 (diff)
Notes
Diffstat (limited to 'crypto/openssh/includes.h')
-rw-r--r--crypto/openssh/includes.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index 32e9b8420bbd..0dc2fb7baf02 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.17 2002/01/26 16:44:22 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $ */
/* $FreeBSD$ */
/*
@@ -34,6 +34,7 @@ __RCSID(msg)
#include <grp.h>
#include <time.h>
#include <dirent.h>
+#include <stddef.h>
#ifdef HAVE_LIMITS_H
# include <limits.h> /* For PATH_MAX */
@@ -181,6 +182,16 @@ __RCSID(msg)
# include <kafs.h>
#endif
+/*
+ * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations
+ * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
+ */
+#ifdef __hpux
+# ifdef _INCLUDE__STDC__
+# undef _INCLUDE__STDC__
+# endif
+#endif
+
#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */
#include "defines.h"