- (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't

[openssh.git] / monitor_mm.c

diff --git a/monitor_mm.c b/monitor_mm.c
index ff523a5b1e4c511da51e5a88f04af9bf51fb1471..faf9f3dcb4f6e9eadd14732c5d77e36c37a6fd18 100644 (file)
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: monitor_mm.c,v 1.16 2009/06/22 05:39:28 dtucker Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -24,14 +25,20 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_mm.c,v 1.9 2004/05/11 19:01:43 deraadt Exp $");
 
+#include <sys/types.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#include <sys/param.h>
+#include "openbsd-compat/sys-tree.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
 
-#include "ssh.h"
 #include "xmalloc.h"
+#include "ssh.h"
 #include "log.h"
 #include "monitor_mm.h"
 
@@ -92,7 +99,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
        mm->mmalloc = mmalloc;
 
        address = xmmap(size);
-       if (address == MAP_FAILED)
+       if (address == (void *)MAP_FAILED)
                fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
 
        mm->address = address;