summaryrefslogtreecommitdiff
path: root/includes.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-22 13:57:07 +1100
committerDamien Miller <djm@mindrot.org>1999-11-22 13:57:07 +1100
commitb3ca3aa12f8248c2d9e23f15a46e0f3c97397e54 (patch)
tree7833695d2f077b965b02a5b9927be50456d172d7 /includes.h
parenta75cb9666237b3479471238eb26b39872b9858e0 (diff)
downloadopenssh-git-b3ca3aa12f8248c2d9e23f15a46e0f3c97397e54.tar.gz
- Added OpenBSD bsd-strlcat.c, created bsd-strlcat.h
- Added timersum() macro - Tidy RCSIDs of bsd-*.c
Diffstat (limited to 'includes.h')
-rw-r--r--includes.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes.h b/includes.h
index 06245fdc..722c6b3b 100644
--- a/includes.h
+++ b/includes.h
@@ -27,7 +27,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <sys/time.h>
#include <sys/un.h>
#include <sys/resource.h>
@@ -65,6 +64,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_LIBPAM
# include <security/pam_appl.h>
#endif
@@ -72,6 +74,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include "version.h"
#include "helper.h"
#include "bsd-strlcpy.h"
+#include "bsd-strlcat.h"
#include "bsd-mktemp.h"
/* Define this to be the path of the xauth program. */