aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-09-25 14:03:13 -0700
committerPaul Eggert2011-09-25 14:03:13 -0700
commitb62b53e8e9cdcc6d8392ffa0c9d17cb2b0e534e2 (patch)
treea842d6729d2f975a2e7121c058641df5ffe4c2d1
parent5895d7b92473b639531395df260729998d609653 (diff)
downloademacs-b62b53e8e9cdcc6d8392ffa0c9d17cb2b0e534e2.tar.gz
emacs-b62b53e8e9cdcc6d8392ffa0c9d17cb2b0e534e2.zip
* puresize.h (PURESIZE_RATIO): Shrink this to 8/6 on 32-bit hosts
configured --with-wide-int.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/puresize.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 312951457e4..cc6c01a4360 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -556,6 +556,8 @@
556 (conv_lisp_to_sockaddr): Don't assume fixnums fit into int. 556 (conv_lisp_to_sockaddr): Don't assume fixnums fit into int.
557 (Faccept_process_output): Use duration_to_sec_usec to do proper 557 (Faccept_process_output): Use duration_to_sec_usec to do proper
558 overflow checking on durations. 558 overflow checking on durations.
559 * puresize.h (PURESIZE_RATIO): Shrink this to 8/6 on 32-bit hosts
560 configured --with-wide-int.
559 * scroll.c (calculate_scrolling, calculate_direct_scrolling) 561 * scroll.c (calculate_scrolling, calculate_direct_scrolling)
560 (line_ins_del): Use int, not EMACS_INT, where int is wide enough. 562 (line_ins_del): Use int, not EMACS_INT, where int is wide enough.
561 * search.c (looking_at_1, string_match_1): 563 * search.c (looking_at_1, string_match_1):
diff --git a/src/puresize.h b/src/puresize.h
index c26c496a757..a1b7007805b 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -46,8 +46,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ 46/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
47#ifndef PURESIZE_RATIO 47#ifndef PURESIZE_RATIO
48#if BITS_PER_EMACS_INT > 32 48#if BITS_PER_EMACS_INT > 32
49#if PTRDIFF_MAX >> 31 != 0
49#define PURESIZE_RATIO 10/6 /* Don't surround with `()'. */ 50#define PURESIZE_RATIO 10/6 /* Don't surround with `()'. */
50#else 51#else
52#define PURESIZE_RATIO 8/6 /* Don't surround with `()'. */
53#endif
54#else
51#define PURESIZE_RATIO 1 55#define PURESIZE_RATIO 1
52#endif 56#endif
53#endif 57#endif