Import of OpenSSH 4.2p1

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

diff --git a/openssh/includes.h b/openssh/includes.h
index 3d3aa3b21c3463ea9740b461a6814cd12bbef844..fa65aa38d6bbcbc8eafa17b37dfae78e162d0544 100644 (file)
--- a/openssh/includes.h
+++ b/openssh/includes.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $       */
+/*     $OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -17,10 +17,11 @@
 #define INCLUDES_H
 
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -168,6 +169,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # include <ia.h>
 #endif
 
+#ifdef HAVE_IAF_H
+# include <iaf.h>
+#endif
+
 #ifdef HAVE_TMPDIR_H
 # include <tmpdir.h>
 #endif
@@ -181,6 +186,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # include <kafs.h>
 #endif
 
+#if defined(HAVE_SYS_SYSLOG_H)
+# include <sys/syslog.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.