diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 00:24:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 00:24:42 (GMT) |
| commit | 011c6d0f7498bf390e8df1ae646cfb649d8e143f (patch) | |
| tree | cf4ee761e8a9ccc9890882366c8a537fc29ef162 /config.tests/unix/endian/endiantest.cpp | |
| parent | acbfa8717b07c2d5b85c62bcf70da3ef4983addb (diff) | |
| parent | 123a3aacd6a40fb07a225ef4db34ff7f986363ce (diff) | |
| download | Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.zip Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.tar.gz Qt-011c6d0f7498bf390e8df1ae646cfb649d8e143f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bump Qt version to 4.7.4
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
Diffstat (limited to 'config.tests/unix/endian/endiantest.cpp')
| -rw-r--r-- | config.tests/unix/endian/endiantest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.tests/unix/endian/endiantest.cpp b/config.tests/unix/endian/endiantest.cpp index 296f890..40b2c38 100644 --- a/config.tests/unix/endian/endiantest.cpp +++ b/config.tests/unix/endian/endiantest.cpp @@ -48,9 +48,9 @@ short lsb_littleendian[] = { 0x0000, 0x654c, 0x7361, 0x5374, 0x6769, 0x696e, 0x6 int main(int, char **) { // make sure the linker doesn't throw away the arrays - char *msb_bigendian_string = (char *) msb_bigendian; - char *lsb_littleendian_string = (char *) lsb_littleendian; - (void) msb_bigendian_string; - (void) lsb_littleendian_string; + void (*msb_bigendian_string)() = (void (*)())msb_bigendian; + void (*lsb_littleendian_string)() = (void (*)())lsb_littleendian; + (void)msb_bigendian_string(); + (void)lsb_littleendian_string(); return msb_bigendian[1] == lsb_littleendian[1]; } |