From 2b43ad9588b8c7f0c9fdc1d95f4f972257215fca Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 5 Oct 2008 19:32:52 +0000 Subject: [PATCH] gcc no longer defines __block to nothing when blocks aren't enabled. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57129 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Lex/Preprocessor.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 4cd8bce6aa..c97cda3bcd 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -436,10 +436,7 @@ static void InitializePredefinedMacros(Preprocessor &PP, if (PP.getLangOptions().Blocks) { DefineBuiltinMacro(Buf, "__block=__attribute__((__blocks__(byref)))"); DefineBuiltinMacro(Buf, "__BLOCKS__=1"); - } else - // This allows "__block int unusedVar;" even when blocks are disabled. - // This is modeled after GCC's handling of __strong/__weak. - DefineBuiltinMacro(Buf, "__block="); + } if (PP.getLangOptions().CPlusPlus) { DefineBuiltinMacro(Buf, "__DEPRECATED=1"); -- 2.40.0