summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--monitor_mm.c2
-rw-r--r--openbsd-compat/xmmap.h23
3 files changed, 27 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a249f0a45..0bfeeddeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync 4 - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
5 with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com. 5 with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
6 - (bal) [configure.ac] Missing ;; from cray patch. 6 - (bal) [configure.ac] Missing ;; from cray patch.
7 - (bal) [monitor_mm.c openbsd-compat/xmmap.h] Move xmmap() defines
8 into it's own header.
7 9
820020721 1020020721
9 - (stevesk) [auth-pam.c] merge cosmetic changes from solar's 11 - (stevesk) [auth-pam.c] merge cosmetic changes from solar's
@@ -1415,4 +1417,4 @@
1415 - (stevesk) entropy.c: typo in debug message 1417 - (stevesk) entropy.c: typo in debug message
1416 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1418 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1417 1419
1418$Id: ChangeLog,v 1.2390 2002/07/23 00:00:05 mouring Exp $ 1420$Id: ChangeLog,v 1.2391 2002/07/23 00:03:33 mouring Exp $
diff --git a/monitor_mm.c b/monitor_mm.c
index c0e141343..fbf57b439 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -28,9 +28,9 @@ RCSID("$OpenBSD: monitor_mm.c,v 1.7 2002/06/28 01:49:31 millert Exp $");
28 28
29#ifdef HAVE_SYS_MMAN_H 29#ifdef HAVE_SYS_MMAN_H
30#include <sys/mman.h> 30#include <sys/mman.h>
31void *xmmap(size_t);
32#endif 31#endif
33 32
33#include "openbsd-compat/xmmap.h"
34#include "ssh.h" 34#include "ssh.h"
35#include "xmalloc.h" 35#include "xmalloc.h"
36#include "log.h" 36#include "log.h"
diff --git a/openbsd-compat/xmmap.h b/openbsd-compat/xmmap.h
new file mode 100644
index 000000000..c0fa04aca
--- /dev/null
+++ b/openbsd-compat/xmmap.h
@@ -0,0 +1,23 @@
1/*
2 * Redistribution and use in source and binary forms, with or without
3 * modification, are permitted provided that the following conditions
4 * are met:
5 * 1. Redistributions of source code must retain the above copyright
6 * notice, this list of conditions and the following disclaimer.
7 * 2. Redistributions in binary form must reproduce the above copyright
8 * notice, this list of conditions and the following disclaimer in the
9 * documentation and/or other materials provided with the distribution.
10 *
11 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
12 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
13 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
14 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
15 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
16 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
17 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
18 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
19 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
20 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21 */
22
23void *xmmap(size_t size);