summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-05-12 00:22:46 +0000
committerBill Wendling <isanbard@gmail.com>2012-05-12 00:22:46 +0000
commit5e7f2a0097a08dc1d872666397ad2c0d6a252fd6 (patch)
tree0236bb0bf0b67764ead3b8e669a99f85042166cc
parent8f441bf3c6ba0207bf728b716ebda40a97c5a0d3 (diff)
downloadllvm-5e7f2a0097a08dc1d872666397ad2c0d6a252fd6.tar.gz
Merging r155910:
------------------------------------------------------------------------ r155910 | chapuni | 2012-05-01 03:51:55 -0700 (Tue, 01 May 2012) | 1 line clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm: Remove XFAIL and add -U__declspec. mingw32 tends to define built-in __declspec. ------------------------------------------------------------------------ llvm-svn: 156674
-rw-r--r--clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm7
1 files changed, 2 insertions, 5 deletions
diff --git a/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm b/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
index 10023bbc9f9f..82d5a4d9c34e 100644
--- a/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
+++ b/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
@@ -1,10 +1,7 @@
-// RUN: %clang_cc1 -fms-extensions -rewrite-objc -x objective-c++ -fblocks -o %t-rw.cpp %s
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fms-extensions -U__declspec -rewrite-objc -x objective-c++ -fblocks -o %t-rw.cpp %s
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11131490
-// XFAIL: mingw
-// FIXME: __declspec(X) is predefined on mingw.
-
extern "C" __declspec(dllexport) void BreakTheRewriter(void) {
__block int aBlockVariable = 0;
void (^aBlock)(void) = ^ {