--with-wide-int is a no-op on 64-bit hosts

* configure.ac: Clarify wording for --with-wide-int help.
* src/pdumper.c (dump_vectorlike_generic):
Do the eassert even if --with-wide-int was specified unnecessarily.

diff --git a/configure.ac b/configure.ac
index 719eb747ae16399ee470537e83c1eaf711eaf7fe..b1b8c846e14d266e3458d3aeeaf5e8ffe82b797c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -414,7 +414,11 @@ this option's value should be 'yes', 'no', 'lucid', 'athena', 'motif', 'gtk',
          with_x_toolkit=$val
 ])
 
-OPTION_DEFAULT_OFF([wide-int], [prefer wide Emacs integers (typically 62-bit); allows buffer and string size up to 2GB on 32-bit hosts, at the cost of 10% to 30% slowdown of Lisp interpreter and larger memory footprint])
+OPTION_DEFAULT_OFF([wide-int],
+  [prefer wide Emacs integers (typically 62-bit);
+   on 32-bit hosts, this allows buffer and string size up to 2GB,
+   at the cost of 10% to 30% slowdown of Lisp interpreter
+   and larger memory footprint])
 if test "$with_wide_int" = yes; then
   AC_DEFINE([WIDE_EMACS_INT], 1, [Use long long for EMACS_INT if available.])
 fi

diff --git a/src/pdumper.c b/src/pdumper.c
index 63424c5734ad21559805686e09dfa6dd30c57a61..bac6900cd1ae93fceef5ebf79c7cca681a40a8b1 100644 (file)
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2603,7 +2603,7 @@ dump_vectorlike_generic (struct dump_context *ctx,
       Lisp_Object out;
       const Lisp_Object *vslot = &v->contents[i];
       /* In the wide case, we're always misaligned.  */
-#ifndef WIDE_EMACS_INT
+#if INTPTR_MAX == EMACS_INT_MAX
       eassert (ctx->offset % sizeof (out) == 0);
 #endif
       dump_object_start (ctx, &out, sizeof (out));