merged OpenSSH 4.4p1 to trunk

[gssapi-openssh.git] / openssh / monitor_mm.c

diff --git a/openssh/monitor_mm.c b/openssh/monitor_mm.c
index b0ec37cff93aca9fd014aeb6ab8a44cc04a39b9a..dab747532a0df2d82d9c30ad1abbeb0522b5ad2b 100644 (file)
--- a/openssh/monitor_mm.c
+++ b/openssh/monitor_mm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: monitor_mm.c,v 1.15 2006/08/03 03:34:42 deraadt 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"