(sxhash): As far as possible, merge calculation of

[gnu-emacs] / src / puresize.h

diff --git a/src/puresize.h b/src/puresize.h
index 7e3d9afad06b45605bb483a3d1718bfc7fafc9b1..054b2bc4c89d3925835a5eefab6a634b8d6e8724 100644 (file)
--- 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 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -42,13 +42,13 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (400000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1100000 + 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
@@ -63,10 +63,12 @@ Boston, MA 02111-1307, USA.  */
 #define CHECK_IMPURE(obj) \
   { if (PURE_P (obj))    \
       pure_write_error (); }
+
+extern void pure_write_error P_ ((void));
 \f
 /* 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.  */
 
@@ -88,10 +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) */