(window_loop): Test w->dedicated with !NILP instead of EQ Qt.

[gnu-emacs] / src / puresize.h

diff --git a/src/puresize.h b/src/puresize.h
index bdd2d251a5e82cba9671d52299fff1d3d828855d..fa73736bc43cd707680aceb580a2908d83b14043 100644 (file)
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,5 +1,6 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,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 +43,13 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (610000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1200000 + 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 10/6    /* Don't surround with `()'. */
 #else
 #define PURESIZE_RATIO 1
 #endif
@@ -64,11 +65,11 @@ Boston, MA 02111-1307, USA.  */
   { if (PURE_P (obj))    \
       pure_write_error (); }
 
-extern void pure_write_error P_ ((void));
+extern void pure_write_error P_ ((void)) NO_RETURN;
 \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.  */
 
@@ -90,9 +91,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) */