diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/tools/qglobal.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/tools/qglobal.cpp')
| -rw-r--r-- | src/tools/qglobal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index 296e600f0..07074c9fd 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -113,7 +113,7 @@ bool tqSysInfo( int *wordSize, bool *bigEndian ) } si_wordSize = 0; - Q_ULONG n = (Q_ULONG)(~0); + TQ_ULONG n = (TQ_ULONG)(~0); while ( n ) { // detect word size si_wordSize++; n /= 2; @@ -128,8 +128,8 @@ bool tqSysInfo( int *wordSize, bool *bigEndian ) #endif return FALSE; } - if ( sizeof(Q_INT8) != 1 || sizeof(Q_INT16) != 2 || sizeof(Q_INT32) != 4 || - sizeof(Q_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) { + if ( sizeof(TQ_INT8) != 1 || sizeof(TQ_INT16) != 2 || sizeof(TQ_INT32) != 4 || + sizeof(TQ_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) { #if defined(QT_CHECK_RANGE) tqFatal( "qSysInfo: Unsupported system data type size" ); #endif |