diff options
| -rw-r--r-- | Driver/RewriteObjC.cpp | 8 | ||||
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp index cf715d0cdc..3f40e4a67a 100644 --- a/Driver/RewriteObjC.cpp +++ b/Driver/RewriteObjC.cpp @@ -330,8 +330,6 @@ void RewriteObjC::Initialize(ASTContext &context) { Preamble += "__OBJC_RW_EXTERN int objc_exception_match"; Preamble += "(struct objc_class *, struct objc_object *);\n"; Preamble += "__OBJC_RW_EXTERN Protocol *objc_getProtocol(const char *);\n"; - if (LangOpts.Microsoft) - Preamble += "#undef __OBJC_RW_EXTERN\n"; Preamble += "#ifndef __FASTENUMERATIONSTATE\n"; Preamble += "struct __objcFastEnumerationState {\n\t"; Preamble += "unsigned long state;\n\t"; @@ -347,11 +345,13 @@ void RewriteObjC::Initialize(ASTContext &context) { Preamble += " char *str;\n"; Preamble += " long length;\n"; Preamble += "};\n"; - Preamble += "extern int __CFConstantStringClassReference[];\n"; + Preamble += "__OBJC_RW_EXTERN int __CFConstantStringClassReference[];\n"; Preamble += "#define __NSCONSTANTSTRINGIMPL\n"; Preamble += "#endif\n"; - if (LangOpts.Microsoft) + if (LangOpts.Microsoft) { + Preamble += "#undef __OBJC_RW_EXTERN\n"; Preamble += "#define __attribute__(X)\n"; + } } diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index ccc9a8781f..8dac3f066f 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -402,6 +402,8 @@ static void InitializePredefinedMacros(Preprocessor &PP, DefineBuiltinMacro(Buf, "__STDC_HOSTED__=1"); if (PP.getLangOptions().ObjC1) DefineBuiltinMacro(Buf, "__OBJC__=1"); + if (PP.getLangOptions().ObjC2) + DefineBuiltinMacro(Buf, "OBJC_NEW_PROPERTIES"); // Add __builtin_va_list typedef. { |