diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-23 00:03:33 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-23 00:03:33 +0000 |
commit | 446d886fa5b295b03031de840286dbe4b7d904a3 (patch) | |
tree | 91fa8c33b19e120224294d76a64b2b8f0c2ca3d6 | |
parent | 762104ede03f5ed71dadc77466aa1948531d8704 (diff) |
- (bal) [monitor_mm.c openbsd-compat/xmmap.h] Move xmmap() defines
into it's own header.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | monitor_mm.c | 2 | ||||
-rw-r--r-- | openbsd-compat/xmmap.h | 23 |
3 files changed, 27 insertions, 2 deletions
@@ -4,6 +4,8 @@ - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com. - (bal) [configure.ac] Missing ;; from cray patch. + - (bal) [monitor_mm.c openbsd-compat/xmmap.h] Move xmmap() defines + into it's own header. 20020721 - (stevesk) [auth-pam.c] merge cosmetic changes from solar's @@ -1415,4 +1417,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2390 2002/07/23 00:00:05 mouring Exp $ +$Id: ChangeLog,v 1.2391 2002/07/23 00:03:33 mouring Exp $ diff --git a/monitor_mm.c b/monitor_mm.c index c0e14134..fbf57b43 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 $"); #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -void *xmmap(size_t); #endif +#include "openbsd-compat/xmmap.h" #include "ssh.h" #include "xmalloc.h" #include "log.h" diff --git a/openbsd-compat/xmmap.h b/openbsd-compat/xmmap.h new file mode 100644 index 00000000..c0fa04ac --- /dev/null +++ b/openbsd-compat/xmmap.h @@ -0,0 +1,23 @@ +/* + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +void *xmmap(size_t size); |