diff --git a/lisp/Darwin-os.c b/lisp/Darwin-os.c index 6f44d977ca6a4b71ed4d6aa7158cf4398b17d0fe..e396e94e15ef90e9c78706c799942db2afb228f1 100644 --- a/lisp/Darwin-os.c +++ b/lisp/Darwin-os.c @@ -14,7 +14,7 @@ * Frobbed for OpenBSD by Pierre R. Mai, 2001. * Frobbed for Darwin by Pierre R. Mai, 2003. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.7 2006/01/31 03:16:39 rtoy Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.8 2007/06/12 03:21:46 cshapiro Exp $ * */ @@ -223,12 +223,10 @@ os_set_context(void) os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; + int flags = MAP_PRIVATE | MAP_ANON; if (addr) flags |= MAP_FIXED; - else - flags |= MAP_VARIABLE; DPRINTF(0, (stderr, "os_validate %x %d => ", addr, len)); diff --git a/lisp/Darwin-os.h b/lisp/Darwin-os.h index 577062f2e8eb7b0abea22479fbf937e8f4a67640..d51ac21283b94a272589ae5fb7690a16fd6785b4 100644 --- a/lisp/Darwin-os.h +++ b/lisp/Darwin-os.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.h,v 1.4 2007/01/01 11:53:02 cshapiro Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.h,v 1.5 2007/06/12 03:21:46 cshapiro Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -17,9 +17,6 @@ #include <ucontext.h> #include <mach/vm_types.h> -#define MAP_ANONYMOUS MAP_ANON -#define MAP_VARIABLE 0 - typedef caddr_t os_vm_address_t; typedef vm_size_t os_vm_size_t; typedef off_t os_vm_offset_t; diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c index 59bf235e659ea9a286ee52a3122297ae4fd560c5..27bc76d044a053be71629a5850db3cd7da7a701b 100644 --- a/lisp/FreeBSD-os.c +++ b/lisp/FreeBSD-os.c @@ -12,7 +12,7 @@ * Much hacked by Paul Werkowski * GENCGC support by Douglas Crosher, 1996, 1997. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.14 2007/06/10 06:39:46 cshapiro Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.15 2007/06/12 03:21:46 cshapiro Exp $ * */ @@ -91,12 +91,10 @@ os_set_context(void) os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; + int flags = MAP_PRIVATE | MAP_ANON; if (addr) flags |= MAP_FIXED; - else - flags |= MAP_VARIABLE; addr = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0); diff --git a/lisp/FreeBSD-os.h b/lisp/FreeBSD-os.h index ff3335fd126aee02cf5edd6ea22a08847224c0f9..e621e3d3520360cc94f6d6acaf971d8a09424094 100644 --- a/lisp/FreeBSD-os.h +++ b/lisp/FreeBSD-os.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.h,v 1.12 2007/06/12 02:58:27 cshapiro Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.h,v 1.13 2007/06/12 03:21:46 cshapiro Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -20,9 +20,6 @@ #include <string.h> #include <unistd.h> -#define MAP_ANONYMOUS MAP_ANON -#define MAP_VARIABLE 0 - typedef caddr_t os_vm_address_t; typedef vm_size_t os_vm_size_t; typedef off_t os_vm_offset_t; diff --git a/lisp/Linux-os.h b/lisp/Linux-os.h index 35c8d781fb4efb573f8410cab66bec14d9b3fbc2..4c09a3ad95a9a8e266f7957a6917439853f32826 100644 --- a/lisp/Linux-os.h +++ b/lisp/Linux-os.h @@ -1,4 +1,4 @@ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.h,v 1.20 2007/01/01 11:53:02 cshapiro Exp $ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.h,v 1.21 2007/06/12 03:21:46 cshapiro Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -25,7 +25,6 @@ #include <asm/unistd.h> #include <errno.h> #include <linux/version.h> -#define MAP_VARIABLE 0 #define linuxversion(a, b, c) (((a)<<16)+((b)<<8)+(c)) diff --git a/lisp/NetBSD-os.c b/lisp/NetBSD-os.c index 2976120c6be362eb45ee901a17f50368c8156ab2..fa121c01471dc8b46e36bed0cf2c62fdd60a8f14 100644 --- a/lisp/NetBSD-os.c +++ b/lisp/NetBSD-os.c @@ -15,7 +15,7 @@ * Frobbed for OpenBSD by Pierre R. Mai, 2001. * Frobbed for NetBSD by Pierre R. Mai, 2002. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/NetBSD-os.c,v 1.4 2006/11/07 11:24:12 cshapiro Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/NetBSD-os.c,v 1.5 2007/06/12 03:21:46 cshapiro Exp $ * */ @@ -116,7 +116,7 @@ os_set_context(void) os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; + int flags = MAP_PRIVATE | MAP_ANON; /* * NetBSD 1.5.2 seems to insist on each mmap being less than 128MB. @@ -127,8 +127,6 @@ os_validate(os_vm_address_t addr, os_vm_size_t len) if (addr) flags |= MAP_FIXED; - else - flags |= MAP_VARIABLE; DPRINTF(0, (stderr, "os_validate %p %d =>", addr, len)); diff --git a/lisp/NetBSD-os.h b/lisp/NetBSD-os.h index 92b96273c419051446bc6353371a2dce9056e8a7..562289b94b3113d4460101e1d8ef008386a038be 100644 --- a/lisp/NetBSD-os.h +++ b/lisp/NetBSD-os.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/NetBSD-os.h,v 1.6 2007/01/01 11:53:02 cshapiro Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/NetBSD-os.h,v 1.7 2007/06/12 03:21:46 cshapiro Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -15,9 +15,6 @@ #include <sys/signal.h> #include <ucontext.h> -#define MAP_ANONYMOUS MAP_ANON -#define MAP_VARIABLE 0 - typedef caddr_t os_vm_address_t; typedef size_t os_vm_size_t; typedef off_t os_vm_offset_t; diff --git a/lisp/OpenBSD-os.c b/lisp/OpenBSD-os.c index c1c9bc41e48cc8102290dbf52c504607657bcab5..5b883481d2b5030f727c7442fdef8e458ffec939 100644 --- a/lisp/OpenBSD-os.c +++ b/lisp/OpenBSD-os.c @@ -13,7 +13,7 @@ * GENCGC support by Douglas Crosher, 1996, 1997. * Frobbed for OpenBSD by Pierre R. Mai, 2001. * - * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/OpenBSD-os.c,v 1.3 2006/11/07 11:24:12 cshapiro Exp $ + * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/OpenBSD-os.c,v 1.4 2007/06/12 03:21:46 cshapiro Exp $ * */ @@ -89,12 +89,10 @@ os_set_context(void) os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; + int flags = MAP_PRIVATE | MAP_ANON; if (addr) flags |= MAP_FIXED; - else - flags |= MAP_VARIABLE; DPRINTF(0, (stderr, "os_validate %x %d => ", addr, len)); diff --git a/lisp/OpenBSD-os.h b/lisp/OpenBSD-os.h index 2257249d3ec8e599ea8be8d262d162bc6f124072..c69dcdb03ffe62d085d738e0321e9370cc0a5235 100644 --- a/lisp/OpenBSD-os.h +++ b/lisp/OpenBSD-os.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/OpenBSD-os.h,v 1.5 2007/01/01 11:53:02 cshapiro Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/OpenBSD-os.h,v 1.6 2007/06/12 03:21:46 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -15,9 +15,6 @@ #include <sys/mman.h> #include <sys/signal.h> -#define MAP_ANONYMOUS MAP_ANON -#define MAP_VARIABLE 0 - typedef caddr_t os_vm_address_t; typedef vm_size_t os_vm_size_t; typedef off_t os_vm_offset_t;