diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
| commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
| tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /includes.h | |
| parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
| parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) | |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'includes.h')
| -rw-r--r-- | includes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes.h b/includes.h index 3a6b4c32b..3d3aa3b21 100644 --- a/includes.h +++ b/includes.h | |||
| @@ -185,7 +185,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
| 185 | * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations | 185 | * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations |
| 186 | * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here. | 186 | * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here. |
| 187 | */ | 187 | */ |
| 188 | #ifdef __hpux | 188 | #ifdef GETSPNAM_CONFLICTING_DEFS |
| 189 | # ifdef _INCLUDE__STDC__ | 189 | # ifdef _INCLUDE__STDC__ |
| 190 | # undef _INCLUDE__STDC__ | 190 | # undef _INCLUDE__STDC__ |
| 191 | # endif | 191 | # endif |