diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-03-15 17:42:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 06:12:00 +0100 |
| commit | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (patch) | |
| tree | 4767d70f80e2fa426d0ce8740231d17d5a17575a /config.tests | |
| parent | 8e8ef6f5f5a56e9965db3e37d29b42103f9774ca (diff) | |
arch: Undefine possible architecture defines
Some compilers define the architecture to one leading to detecting
'1' as target architecture. Always undef the architecture name.
Compilers:
gcc version 4.6.3 (Debian 4.6.3-1) has '#define i386 1'
gcc version 4.5.3 (Broadcom stbgcc-4.5.3-1.3) has '#define mips 1'
Change-Id: I7af1bb743579be472467c74e6c08638648823ef3
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/arch/arch.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index 0c12565f7c..f942d0adc7 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -41,6 +41,19 @@ // NOTE: This file is not meant to be compiled, only preprocessed. #include "../../src/corelib/global/qprocessordetection.h" +#undef alpha +#undef arm +#undef avr32 +#undef bfin +#undef i386 +#undef x86_64 +#undef ia64 +#undef mips +#undef power +#undef s390 +#undef sh +#undef sparc +#undef unknown #if defined(Q_PROCESSOR_ALPHA) alpha #elif defined(Q_PROCESSOR_ARM) |