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 | 287a2bfc0331b74b54ca292c3427d235e8c7bf21 (patch) | |
| tree | c25473ce449bf1a212bad8f1c3ecc0e48741341c /clang/lib/Frontend/RewriteObjC.cpp | |
| parent | 94ed6dc906f581609ca679713d623e3783303bd8 (diff) | |
| download | bcm5719-llvm-287a2bfc0331b74b54ca292c3427d235e8c7bf21.tar.gz bcm5719-llvm-287a2bfc0331b74b54ca292c3427d235e8c7bf21.zip | |
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).
llvm-svn: 90693
Diffstat (limited to 'clang/lib/Frontend/RewriteObjC.cpp')
| -rw-r--r-- | clang/lib/Frontend/RewriteObjC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/RewriteObjC.cpp index a9bf3c04fc0..a744ff37427 100644 --- a/clang/lib/Frontend/RewriteObjC.cpp +++ b/clang/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"; |
