feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Changed BLOCKS undef on MacOS to work with system header files.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-15 16:23:32 +01:00
parent e3e6797fe5
commit 070d06c163
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -177,10 +177,11 @@ QByteArray GccToolChain::predefinedMacros()
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// Turn off flag indicating Apple's blocks support // Turn off flag indicating Apple's blocks support
int idx = m_predefinedMacros.indexOf("#define __BLOCKS__ 1"); const QByteArray blocksDefine("#define __BLOCKS__ 1");
const QByteArray blocksUndefine("#undef __BLOCKS__");
int idx = m_predefinedMacros.indexOf(blocksDefine);
if (idx != -1) { if (idx != -1) {
idx = m_predefinedMacros.indexOf('1', idx); m_predefinedMacros.replace(idx, blocksDefine.length(), blocksUndefine);
m_predefinedMacros[idx] = '0';
} }
// Define __strong and __weak (used for Apple's GC extension of C) to be empty // Define __strong and __weak (used for Apple's GC extension of C) to be empty