diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-12-06 01:52:22 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-12-06 01:52:22 +0000 |
| commit | c9c1e9c4b513e83146eff1728142683980df26a7 (patch) | |
| tree | 7bcf47b4e83b3b2272e8455f8dcbfae27ea397a7 /lib/Frontend/RewriteObjC.cpp | |
| parent | fd5b76fe99a123630321b45667a78f1a15be7241 (diff) | |
Integrate the following from the 'objective-rewrite' branch:
http://llvm.org/viewvc/llvm-project?view=rev&revision=86026
Note: The 'improved debugging' changes weren't integrated (since they were later reverted, since they didn't improve debugging).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90693 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/RewriteObjC.cpp')
| -rw-r--r-- | lib/Frontend/RewriteObjC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp index a9bf3c04fc..a744ff3742 100644 --- a/lib/Frontend/RewriteObjC.cpp +++ b/lib/Frontend/RewriteObjC.cpp @@ -555,7 +555,7 @@ void RewriteObjC::Initialize(ASTContext &context) { Preamble += " void *FuncPtr;\n"; Preamble += "};\n"; Preamble += "// Runtime copy/destroy helper functions (from Block_private.h)\n"; - Preamble += "#ifdef CF_EXPORT_CONSTANT_STRING\n"; + Preamble += "#ifdef __OBJC_EXPORT_BLOCKS\n"; Preamble += "extern \"C\" __declspec(dllexport) void _Block_object_assign(void *, const void *, const int);\n"; Preamble += "extern \"C\" __declspec(dllexport) void _Block_object_dispose(const void *, const int);\n"; Preamble += "extern \"C\" __declspec(dllexport) void *_NSConcreteGlobalBlock[32];\n"; |