diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /includes.h | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'includes.h')
-rw-r--r-- | includes.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/includes.h b/includes.h index 3d3aa3b21..fa65aa38d 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -17,10 +17,11 @@ | |||
17 | #define INCLUDES_H | 17 | #define INCLUDES_H |
18 | 18 | ||
19 | #define RCSID(msg) \ | 19 | #define RCSID(msg) \ |
20 | static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | 20 | static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } |
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | 23 | ||
24 | #include <stdarg.h> | ||
24 | #include <stdio.h> | 25 | #include <stdio.h> |
25 | #include <ctype.h> | 26 | #include <ctype.h> |
26 | #include <errno.h> | 27 | #include <errno.h> |
@@ -168,6 +169,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
168 | # include <ia.h> | 169 | # include <ia.h> |
169 | #endif | 170 | #endif |
170 | 171 | ||
172 | #ifdef HAVE_IAF_H | ||
173 | # include <iaf.h> | ||
174 | #endif | ||
175 | |||
171 | #ifdef HAVE_TMPDIR_H | 176 | #ifdef HAVE_TMPDIR_H |
172 | # include <tmpdir.h> | 177 | # include <tmpdir.h> |
173 | #endif | 178 | #endif |
@@ -181,6 +186,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
181 | # include <kafs.h> | 186 | # include <kafs.h> |
182 | #endif | 187 | #endif |
183 | 188 | ||
189 | #if defined(HAVE_SYS_SYSLOG_H) | ||
190 | # include <sys/syslog.h> | ||
191 | #endif | ||
192 | |||
184 | /* | 193 | /* |
185 | * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations | 194 | * 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. | 195 | * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here. |