[Emacs-diffs] emacs-25 699a7ab 1/2: Port to GCC 7

[Paul Eggert]

branch: emacs-25
commit 699a7ab7d990ab4011ce9296dcbf320ac0ab433d
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Port to GCC 7
    
    Or, more accurately, to any system that #defines CHAR_WIDTH
    to something else.  Do not merge to master.
    * src/character.h (CHAR_WIDTH): Undef before defining.
---
 src/character.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/character.h b/src/character.h
index a94ec6d..18f0457 100644
--- a/src/character.h
+++ b/src/character.h
@@ -590,6 +590,7 @@ sanitize_char_width (EMACS_INT width)
    columns C will occupy on the screen when displayed in the current
    buffer.  */
 
+#undef CHAR_WIDTH /* in case system headers follow ISO/IEC TS 18661-1:2014 */
 #define CHAR_WIDTH(c)          \
   (ASCII_CHAR_P (c)            \
    ? ASCII_CHAR_WIDTH (c)      \