X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e5372b9c5e14351f1ca56b5e8934f9a5f1c9ca59..1a271e14d73298ecc665993ac7d0087ab2a66f92:/src/puresize.h diff --git a/src/puresize.h b/src/puresize.h index 74527330dd..f82c705265 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,5 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,8 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for. @@ -42,13 +42,13 @@ Boston, MA 02111-1307, USA. */ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (600000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1180000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ #ifndef PURESIZE_RATIO -#if VALBITS + GCTYPEBITS + 1 > 32 -#define PURESIZE_RATIO 8/5 /* Don't surround with `()'. */ +#if BITS_PER_EMACS_INT > 32 +#define PURESIZE_RATIO 9/5 /* Don't surround with `()'. */ #else #define PURESIZE_RATIO 1 #endif @@ -68,7 +68,7 @@ extern void pure_write_error P_ ((void)); /* Define PURE_P. */ -#ifdef VIRT_ADDR_VARIES +#if defined(VIRT_ADDR_VARIES) || defined(CYGWIN) /* For machines like APOLLO where text and data can go anywhere in virtual memory. */ @@ -90,9 +90,12 @@ extern char my_edata[]; #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */ extern char my_edata[]; - + #define PURE_P(obj) \ (XPNTR (obj) < (unsigned int) my_edata) #endif /* PNTR_COMPARISON_TYPE */ #endif /* VIRT_ADDRESS_VARIES */ + +/* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f + (do not change this comment) */