- (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise

   prot.h and shadow.h provide conflicting declarations of getspnam.  ok djm@

2 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3079c3881..ddf0aaa19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20040814
  - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c]
    Explicitly set umask for mkstemp; ok djm@
+ - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise
+   prot.h and shadow.h provide conflicting declarations of getspnam.  ok djm@
 
 20040813
  - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at
@@ -1626,4 +1628,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3506 2004/08/14 13:55:37 dtucker Exp $
+$Id: ChangeLog,v 1.3507 2004/08/14 14:01:48 dtucker Exp $
diff --git a/includes.h b/includes.h
index 99b70502c..3a6b4c32b 100644
--- a/includes.h
+++ b/includes.h
@@ -181,6 +181,16 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" 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"