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

Define __strong and __weak to be empty macros, so we "handle" Apple's GC C extension.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-01-22 10:04:01 +01:00
parent 007d76aada
commit 4b97bf170a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,11 +176,16 @@ QByteArray GccToolChain::predefinedMacros()
m_predefinedMacros = cpp.readAllStandardOutput(); m_predefinedMacros = cpp.readAllStandardOutput();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
// Turn off flag indicating Apple's blocks support
int idx = m_predefinedMacros.indexOf("#define __BLOCKS__ 1"); int idx = m_predefinedMacros.indexOf("#define __BLOCKS__ 1");
if (idx != -1) { if (idx != -1) {
idx = m_predefinedMacros.indexOf("1", idx); idx = m_predefinedMacros.indexOf("1", idx);
m_predefinedMacros[idx] = '0'; m_predefinedMacros[idx] = '0';
} }
// Define __strong and __weak (used for Apple's GC extension of C) to be empty
m_predefinedMacros.append("#define __strong");
m_predefinedMacros.append("#define __weak");
#endif // Q_OS_MAC #endif // Q_OS_MAC
} }
return m_predefinedMacros; return m_predefinedMacros;