diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:46:09 +0000 |
| commit | 983ad11a1c78949e86a0f51f51ef0d614cc5e665 (patch) | |
| tree | 7d41ca8690f59b7463bd4d5fefde78dac8a00e60 /crypto/openssh/includes.h | |
| parent | 3c5bc6b274083ffa3a7aa67e87c8936a1778eff5 (diff) | |
| download | FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.zip FreeBSD-src-983ad11a1c78949e86a0f51f51ef0d614cc5e665.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/includes.h')
| -rw-r--r-- | crypto/openssh/includes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 0dc2fb7..3cbc2c2 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -186,7 +186,7 @@ __RCSID(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 |
