Import of OpenSSH 4.0p1

[gssapi-openssh.git] / openssh / includes.h

diff --git a/openssh/includes.h b/openssh/includes.h
index 3a6b4c32bbac488fca8a7b55e318620335bcb4dd..3d3aa3b21c3463ea9740b461a6814cd12bbef844 100644 (file)
--- a/openssh/includes.h
+++ b/openssh/includes.h
@@ -185,7 +185,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
  * 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 GETSPNAM_CONFLICTING_DEFS
 # ifdef _INCLUDE__STDC__
 #  undef _INCLUDE__STDC__
 # endif