diff options
author | no-author <no-author@gcc.gnu.org> | 2004-04-22 18:51:16 +0000 |
---|---|---|
committer | no-author <no-author@gcc.gnu.org> | 2004-04-22 18:51:16 +0000 |
commit | 255d1216471be681eb2ee9ece11ec735a3f27876 (patch) | |
tree | 8c306f5f27b8edf1ef6e9ea83e476b9872e5642a /gcc/cppcharset.c | |
parent | 28ba643603d86afcea151fc5026a7dc2eaa47da1 (diff) |
This commit was manufactured by cvs2svn to create tagapple/gcc-1742
'apple-gcc-1742'.
git-svn-id: https://gcc.gnu.org/svn/gcc/tags/apple-gcc-1742@81049 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppcharset.c')
-rw-r--r-- | gcc/cppcharset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cppcharset.c b/gcc/cppcharset.c index b46f47a1fe0..8f97a972d70 100644 --- a/gcc/cppcharset.c +++ b/gcc/cppcharset.c @@ -1243,7 +1243,10 @@ narrow_str_to_charconst (cpp_reader *pfile, cpp_string str, cpp_error (pfile, CPP_DL_WARNING, "character constant too long for its type"); } - else if (i > 1 && CPP_OPTION (pfile, warn_multichar)) + /* APPLE LOCAL begin -Wfour-char-constants */ + else if ((i == 4 && CPP_OPTION (pfile, warn_four_char_constants)) + || (i > 1 && i != 4 && CPP_OPTION (pfile, warn_multichar))) + /* APPLE LOCAL end -Wfour-char-constants */ cpp_error (pfile, CPP_DL_WARNING, "multi-character character constant"); /* Multichar constants are of type int and therefore signed. */ |