-/* $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $ */
+/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
#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"
+#define _GNU_SOURCE /* activate extra prototypes for glibc */
+
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#ifdef HAVE_NEXT
# include <libc.h>
#endif
-#define __USE_GNU /* before unistd.h, activate extra prototypes for glibc */
#include <unistd.h> /* For STDIN_FILENO, etc */
#include <termios.h> /* Struct winsize */
# include <ia.h>
#endif
+#ifdef HAVE_IAF_H
+# include <iaf.h>
+#endif
+
#ifdef HAVE_TMPDIR_H
# include <tmpdir.h>
#endif
# 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.
*/
-#ifdef __hpux
+#ifdef GETSPNAM_CONFLICTING_DEFS
# ifdef _INCLUDE__STDC__
# undef _INCLUDE__STDC__
# endif