diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-10-06 07:43:09 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-10-06 07:43:09 +0000 |
| commit | eb52b44caf9afbf4bfaf0e3e6f9426d90492b85b (patch) | |
| tree | 38b1168ce4f26ed0bcba18ac223b5103e56effd2 /lib/Lex/Preprocessor.cpp | |
| parent | 506ff88f44562df267b6a06608ab841b76df2a2b (diff) | |
__CONSTANT_CFSTRINGS__ should be defined even in C mode, otherwise the CFSTR
won't expand to the builtin. This fixes rdar://6248329
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57164 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/Preprocessor.cpp')
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 6c5daae13b..ed69e6f933 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -488,12 +488,12 @@ static void InitializePredefinedMacros(Preprocessor &PP, if (PP.getLangOptions().NeXTRuntime) DefineBuiltinMacro(Buf, "__NEXT_RUNTIME__=1"); - - // darwin_constant_cfstrings controls this. This is also dependent - // on other things like the runtime I believe. - DefineBuiltinMacro(Buf, "__CONSTANT_CFSTRINGS__=1"); } + // darwin_constant_cfstrings controls this. This is also dependent + // on other things like the runtime I believe. This is set even for C code. + DefineBuiltinMacro(Buf, "__CONSTANT_CFSTRINGS__=1"); + if (PP.getLangOptions().ObjC2) DefineBuiltinMacro(Buf, "OBJC_NEW_PROPERTIES"); |