Do not assume EMACS_INT is the same width as a pointer.

This prepares for a future patch that will prefer 64-bit EMACS_INT if
available.  That patch can be tried now, by compiling with -DWIDE_EMACS_INT,
but it is temporarily not the default so that it can be further tested.

Also, install some other fixes for problems discovered by the static
checking of GCC 4.6.0.

Fixes: debbugs:8545 debbugs:8601 debbugs:8600 debbugs:8602

1 files changed, 2 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index d17346efdcb..71253df6469 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5368,8 +5368,8 @@ detect_coding_charset (struct coding_system *coding,
               if (src == src_end)
                 goto too_short;
               ONE_MORE_BYTE (c);
-              if (c < charset->code_space[(dim - 1 - idx) * 2]
-                  || c > charset->code_space[(dim - 1 - idx) * 2 + 1])
+              if (c < charset->code_space[(dim - 1 - idx) * 4]
+                  || c > charset->code_space[(dim - 1 - idx) * 4 + 1])
                 break;
             }
           if (idx < dim)