summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
120060725
2 - (dtucker) [openbsd-compat/xmmap.c] Need fcntl.h for O_RDRW.
3
120060724 420060724
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2006/07/12 13:39:55 6 - jmc@cvs.openbsd.org 2006/07/12 13:39:55
@@ -5056,4 +5059,4 @@
5056 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5059 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5057 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5060 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5058 5061
5059$Id: ChangeLog,v 1.4438 2006/07/24 13:50:23 dtucker Exp $ 5062$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 @@
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26/* $Id: xmmap.c,v 1.9 2006/07/24 04:51:01 djm Exp $ */ 26/* $Id: xmmap.c,v 1.10 2006/07/25 09:52:08 dtucker Exp $ */
27 27
28#include "includes.h" 28#include "includes.h"
29 29
@@ -32,6 +32,9 @@
32#include <sys/mman.h> 32#include <sys/mman.h>
33#endif 33#endif
34#include <sys/stat.h> 34#include <sys/stat.h>
35#ifdef HAVE_FCNTL_H
36# include <fcntl.h>
37#endif
35 38
36#include <errno.h> 39#include <errno.h>
37#include <string.h> 40#include <string.h>