Mercurial > emacs
comparison src/puresize.h @ 90998:539530fa389c
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 832-838)
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Update from CVS
- Restore lisp/emacs-lisp/cl-loaddefs.el
- Merge from emacs--rel--22
* emacs--rel--22 (patch 75-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Aug 2007 05:20:51 +0000 |
parents | f55f9811f5d7 1cd1038e9e5d |
children | b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
90997:12fc8f96710b | 90998:539530fa389c |
---|---|
41 #ifndef SITELOAD_PURESIZE_EXTRA | 41 #ifndef SITELOAD_PURESIZE_EXTRA |
42 #define SITELOAD_PURESIZE_EXTRA 0 | 42 #define SITELOAD_PURESIZE_EXTRA 0 |
43 #endif | 43 #endif |
44 | 44 |
45 #ifndef BASE_PURESIZE | 45 #ifndef BASE_PURESIZE |
46 #define BASE_PURESIZE (1120000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) | 46 #define BASE_PURESIZE (1130000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) |
47 #endif | 47 #endif |
48 | 48 |
49 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ | 49 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ |
50 #ifndef PURESIZE_RATIO | 50 #ifndef PURESIZE_RATIO |
51 #if BITS_PER_EMACS_INT > 32 | 51 #if BITS_PER_EMACS_INT > 32 |