diff --git a/src/PythonQtInstanceWrapper.h b/src/PythonQtInstanceWrapper.h index 7b06e7c6..f71f6a04 100644 --- a/src/PythonQtInstanceWrapper.h +++ b/src/PythonQtInstanceWrapper.h @@ -46,28 +46,6 @@ #include "PythonQtSystem.h" -/* - * The following undefs for C standard library macros prevent - * build errors of the following type on mac ox 10.7.4 and XCode 4.3.3 - * -/usr/include/c++/4.2.1/bits/localefwd.h:57:21: error: too many arguments provided to function-like macro invocation - isspace(_CharT, const locale&); - ^ -/usr/include/c++/4.2.1/bits/localefwd.h:56:5: error: 'inline' can only appear on functions - inline bool - ^ -/usr/include/c++/4.2.1/bits/localefwd.h:57:5: error: variable 'isspace' declared as a template - isspace(_CharT, const locale&); - ^ -*/ -#undef isspace -#undef isupper -#undef islower -#undef isalpha -#undef isalnum -#undef toupper -#undef tolower - #include #include "structmember.h" diff --git a/src/PythonQtPythonInclude.h b/src/PythonQtPythonInclude.h index 0dfb3618..b04443cb 100644 --- a/src/PythonQtPythonInclude.h +++ b/src/PythonQtPythonInclude.h @@ -92,4 +92,27 @@ # include #endif +/* + * The following undefs for C standard library macros prevent + * build errors of the following type on mac ox 10.7.4 and XCode 4.3.3 + * +/usr/include/c++/4.2.1/bits/localefwd.h:57:21: error: too many arguments provided to function-like macro invocation + isspace(_CharT, const locale&); + ^ +/usr/include/c++/4.2.1/bits/localefwd.h:56:5: error: 'inline' can only appear on functions + inline bool + ^ +/usr/include/c++/4.2.1/bits/localefwd.h:57:5: error: variable 'isspace' declared as a template + isspace(_CharT, const locale&); + ^ +*/ +#undef isspace +#undef isupper +#undef islower +#undef isalpha +#undef isalnum +#undef toupper +#undef tolower + #endif +