Port to 32-bit MingGW --with-wide-int

Problem reported by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00265.html
* lisp.h (struct Lisp_Sub_Char_Table): Check that offset matches
what we think it is, rather than checking only its alignment (and
doing so incorrectly on MinGW).

2 files changed, 12 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 32f17e1a863..252dfd33620 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to 32-bit MingGW --with-wide-int
+        Problem reported by Eli Zaretskii in:
+        http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00265.html
+        * lisp.h (struct Lisp_Sub_Char_Table): Check that offset matches
+        what we think it is, rather than checking only its alignment (and
+        doing so incorrectly on MinGW).
+
 2015-01-12  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * fileio.c (Ffile_name_as_directory, Fdirectory_file_name):
diff --git a/src/lisp.h b/src/lisp.h
index 9ed9375cff8..6a39f083a41 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1689,10 +1689,9 @@ CHAR_TABLE_EXTRA_SLOTS (struct Lisp_Char_Table *ct)
           - CHAR_TABLE_STANDARD_SLOTS);
 }
 
-/* Make sure that sub char-table contents slot
-   is aligned on a multiple of Lisp_Objects.  */
-verify ((offsetof (struct Lisp_Sub_Char_Table, contents)
-         - offsetof (struct Lisp_Sub_Char_Table, depth)) % word_size == 0);
+/* Make sure that sub char-table contents slot is where we think it is.  */
+verify (offsetof (struct Lisp_Sub_Char_Table, contents)
+        == offsetof (struct Lisp_Vector, contents[SUB_CHAR_TABLE_OFFSET]));
 
 /***********************************************************************
                                Symbols