From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Sep 2017 00:21:56 +0000 (-0700)
Subject: Port to GCC 7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=699a7ab7d990ab4011ce9296dcbf320ac0ab433d;p=emacs.git

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.
---

diff --git a/src/character.h b/src/character.h
index a94ec6d22dd..18f04573516 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)	\