summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-07-25 11:52:07 +0200
committerDarren Tucker <dtucker@zip.com.au>2006-07-25 11:52:07 +0200
commit94346f85967e54ceec7b643eb7e74f4814fd75d7 (patch)
tree2f6ac095cc57eb40b4ab838ba422bb5435beb6bc
parent - (dtucker) [regress/forcecommand.sh] Portablize. (diff)
downloadopenssh-94346f85967e54ceec7b643eb7e74f4814fd75d7.tar.xz
openssh-94346f85967e54ceec7b643eb7e74f4814fd75d7.zip
- (dtucker) [openbsd-compat/xmmap.c] Need fcntl.h for O_RDRW.
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/xmmap.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 77af8bef7..d4a4e7b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20060725
+ - (dtucker) [openbsd-compat/xmmap.c] Need fcntl.h for O_RDRW.
+
20060724
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/07/12 13:39:55
@@ -5056,4 +5059,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4438 2006/07/24 13:50:23 dtucker Exp $
+$Id: ChangeLog,v 1.4439 2006/07/25 09:52:07 dtucker Exp $
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
index 1293dcab0..6a1708e5d 100644
--- a/openbsd-compat/xmmap.c
+++ b/openbsd-compat/xmmap.c
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: xmmap.c,v 1.9 2006/07/24 04:51:01 djm Exp $ */
+/* $Id: xmmap.c,v 1.10 2006/07/25 09:52:08 dtucker Exp $ */
#include "includes.h"
@@ -32,6 +32,9 @@
#include <sys/mman.h>
#endif
#include <sys/stat.h>
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
#include <errno.h>
#include <string.h>