aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Driver/clang.cpp3
-rw-r--r--include/clang/Basic/LangOptions.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 89e0bad4d0..fa0c9fc43f 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -369,7 +369,6 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK) {
// FALL THROUGH.
case lang_gnu99:
case lang_c99:
- Options.Digraphs = 1;
Options.C99 = 1;
Options.HexFloats = 1;
// FALL THROUGH.
@@ -377,6 +376,8 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK) {
Options.BCPLComment = 1; // Only for C99/C++.
// FALL THROUGH.
case lang_c94:
+ Options.Digraphs = 1; // C94, C99, C++.
+ // FALL THROUGH.
case lang_c89:
break;
}
diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index 1c4dac315e..bee0b51ab2 100644
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -24,7 +24,7 @@ struct LangOptions {
unsigned Trigraphs : 1; // Trigraphs in source files.
unsigned BCPLComment : 1; // BCPL-style // comments.
unsigned DollarIdents : 1; // '$' allowed in identifiers.
- unsigned Digraphs : 1; // C++ and C99
+ unsigned Digraphs : 1; // C94, C99 and C++
unsigned HexFloats : 1; // C99 Hexadecimal float constants.
unsigned C99 : 1; // C99 Support
unsigned Microsoft : 1; // Microsoft extensions.