HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23
[bpt/emacs.git]
/
src
/
puresize.h
diff --git
a/src/puresize.h
b/src/puresize.h
index
c199601
..
13e5b0f
100644
(file)
--- a/
src/puresize.h
+++ b/
src/puresize.h
@@
-1,6
+1,6
@@
/* How much read-only Lisp storage a dumped Emacs needs.
Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
/* How much read-only Lisp storage a dumped Emacs needs.
Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2006, 2007, 2008
, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-41,7
+41,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#ifndef BASE_PURESIZE
#endif
#ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1
25
0000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1
62
0000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
#endif
/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
#endif
/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
@@
-72,7
+72,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
{ if (PURE_P (obj)) \
pure_write_error (); }
{ if (PURE_P (obj)) \
pure_write_error (); }
-extern void pure_write_error
P_ ((void)
) NO_RETURN;
+extern void pure_write_error
(void
) NO_RETURN;
\f
/* Define PURE_P. */
\f
/* Define PURE_P. */
@@
-87,7
+87,6
@@
extern EMACS_INT pure[];
&& (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
#else /* not VIRT_ADDR_VARIES */
&& (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
#else /* not VIRT_ADDR_VARIES */
-#ifdef PNTR_COMPARISON_TYPE
/* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */
extern char my_edata[];
/* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */
extern char my_edata[];
@@
-95,14
+94,6
@@
extern char my_edata[];
#define PURE_P(obj) \
((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
#define PURE_P(obj) \
((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) 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
#endif /* VIRT_ADDRESS_VARIES */
/* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f