summaryrefslogtreecommitdiff
path: root/includes.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-16 13:29:26 +1100
committerDamien Miller <djm@mindrot.org>1999-11-16 13:29:26 +1100
commit4874c79a3a05fc18678d7a85d7091f5139630fac (patch)
treec309c17201224df31feafaa308a03da941fd8605 /includes.h
parenta7cafae274f8ee56bc36a20a488254432f70c7d5 (diff)
downloadopenssh-git-4874c79a3a05fc18678d7a85d7091f5139630fac.tar.gz
- Fix some Linux libc5 problems reported by Miles Wilson <mw@mctitle.com>
Diffstat (limited to 'includes.h')
-rw-r--r--includes.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/includes.h b/includes.h
index e2a0ea3b..75349cf3 100644
--- a/includes.h
+++ b/includes.h
@@ -19,9 +19,10 @@ This file includes most of the needed system headers.
#define RCSID(msg) \
static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
+#include "config.h"
+
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/select.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -52,8 +53,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include <time.h>
#include <dirent.h>
-#include "config.h"
-
#ifdef HAVE_NETGROUP_H
# include <netgroup.h>
#endif
@@ -63,16 +62,18 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#ifdef HAVE_ENDIAN_H
# include <endian.h>
#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_LIBPAM
+# include <security/pam_appl.h>
+#endif /* HAVE_PAM */
#include "version.h"
#include "helper.h"
#include "mktemp.h"
#include "strlcpy.h"
-#ifdef HAVE_LIBPAM
-#include <security/pam_appl.h>
-#endif /* HAVE_PAM */
-
/* Define this to be the path of the xauth program. */
#ifndef XAUTH_PATH
#define XAUTH_PATH "/usr/X11R6/bin/xauth"