diff -r 56cd8111b7f7 -r 41300fa6a67c src/corelib/tools/qbytearraymatcher.h --- a/src/corelib/tools/qbytearraymatcher.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/corelib/tools/qbytearraymatcher.h Tue Feb 02 00:43:10 2010 +0200 @@ -79,17 +79,21 @@ QByteArray q_pattern; #ifdef Q_CC_RVCT // explicitely allow anonymous unions for RVCT to prevent compiler warnings -#pragma anon_unions +# pragma push +# pragma anon_unions #endif struct Data { uchar q_skiptable[256]; const uchar *p; int l; - }; + }; union { uint dummy[256]; Data p; }; +#ifdef Q_CC_RVCT +# pragma pop +#endif }; QT_END_NAMESPACE