summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2014-12-11 08:20:09 +0000
committerDamien Miller <djm@mindrot.org>2014-12-11 19:20:29 +1100
commit48b68ce19ca42fa488960028048dec023f7899bb (patch)
tree926ad0be9cfd33becdc5968a855d9c4b7e7c4792
parentd663bea30a294d440fef4398e5cd816317bd4518 (diff)
upstream commit
explicitly include sys/param.h in files that use the howmany() macro; from portable
-rw-r--r--channels.c3
-rw-r--r--includes.h1
-rw-r--r--ssh-keyscan.c4
-rw-r--r--ssh-pkcs11-helper.c3
-rw-r--r--sshconnect.c3
-rw-r--r--sshd.c3
6 files changed, 12 insertions, 5 deletions
diff --git a/channels.c b/channels.c
index 9dcd8128..6db92cba 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.337 2014/10/08 22:15:06 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.338 2014/12/11 08:20:09 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -42,6 +42,7 @@
#include "includes.h"
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/un.h>
diff --git a/includes.h b/includes.h
index 07bcd89f..095161c2 100644
--- a/includes.h
+++ b/includes.h
@@ -23,6 +23,7 @@
#endif
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/socket.h> /* For CMSG_* */
#ifdef HAVE_LIMITS_H
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3fabfba1..84301b6f 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.92 2014/04/29 18:01:49 markus Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.93 2014/12/11 08:20:09 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -9,6 +9,8 @@
#include "includes.h"
+#include <sys/types.h>
+#include <sys/param.h>
#include "openbsd-compat/sys-queue.h"
#include <sys/resource.h>
#ifdef HAVE_SYS_TIME_H
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 0b1d8e4c..d487f023 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11-helper.c,v 1.8 2014/06/24 01:13:21 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11-helper.c,v 1.9 2014/12/11 08:20:09 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
@@ -18,6 +18,7 @@
#include "includes.h"
#include <sys/types.h>
+#include <sys/param.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
diff --git a/sshconnect.c b/sshconnect.c
index f9a59372..4b9681a5 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.252 2014/12/04 02:24:32 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.253 2014/12/11 08:20:09 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,6 +16,7 @@
#include "includes.h"
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/sshd.c b/sshd.c
index 481d0015..4e01855c 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.428 2014/07/15 15:54:14 millert Exp $ */
+/* $OpenBSD: sshd.c,v 1.429 2014/12/11 08:20:09 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,6 +45,7 @@
#include "includes.h"
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#ifdef HAVE_SYS_STAT_H