summaryrefslogtreecommitdiff
path: root/src/character.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-08 17:21:56 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-08 17:42:59 -0700
commit699a7ab7d990ab4011ce9296dcbf320ac0ab433d (patch)
tree20c54d3c880e41c5d253aa6267bdf59f072e2066 /src/character.h
parentda62c1532e479bbac4ce242ee1d170df9c435591 (diff)
downloademacs-699a7ab7d990ab4011ce9296dcbf320ac0ab433d.tar.gz
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.
Diffstat (limited to 'src/character.h')
-rw-r--r--src/character.h1
1 files changed, 1 insertions, 0 deletions
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) \