X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821..0ec6c340e90369b5921b35bed3bd4cfc0368723e:/src/puresize.h diff --git a/src/puresize.h b/src/puresize.h index bee82d1e78..25a11aafbc 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, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -40,16 +40,16 @@ along with GNU Emacs. If not, see . */ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1620000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1700000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ #ifndef PURESIZE_RATIO #if EMACS_INT_MAX >> 31 != 0 #if PTRDIFF_MAX >> 31 != 0 -#define PURESIZE_RATIO 10/6 /* Don't surround with `()'. */ +#define PURESIZE_RATIO 10 / 6 /* Don't surround with `()'. */ #else -#define PURESIZE_RATIO 8/6 /* Don't surround with `()'. */ +#define PURESIZE_RATIO 8 / 6 /* Don't surround with `()'. */ #endif #else #define PURESIZE_RATIO 1 @@ -60,7 +60,7 @@ along with GNU Emacs. If not, see . */ /* ENABLE_CHECKING somehow increases the purespace used, probably because it tends to cause some macro arguments to be evaluated twice. This is a bug, but it's difficult to track it down. */ -#define PURESIZE_CHECKING_RATIO 12/10 /* Don't surround with `()'. */ +#define PURESIZE_CHECKING_RATIO 12 / 10 /* Don't surround with `()'. */ #else #define PURESIZE_CHECKING_RATIO 1 #endif @@ -73,9 +73,9 @@ along with GNU Emacs. If not, see . */ /* Signal an error if OBJ is pure. */ #define CHECK_IMPURE(obj) \ { if (PURE_P (obj)) \ - pure_write_error (); } + pure_write_error (obj); } -extern void pure_write_error (void) NO_RETURN; +extern _Noreturn void pure_write_error (Lisp_Object); /* Define PURE_P. */