diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 17:28:28 -0500 |
| commit | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch) | |
| tree | 7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/tools/ntqglobal.h | |
| parent | f27c2533f735d53c6b555f387c6390c0690cc246 (diff) | |
| download | tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip | |
Automated update from Qt3
Diffstat (limited to 'src/tools/ntqglobal.h')
| -rw-r--r-- | src/tools/ntqglobal.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index b2a6413a3..de5ed88e6 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -712,40 +712,40 @@ typedef int INT32; // 32 bit signed typedef unsigned int UINT32; // 32 bit unsigned #endif -typedef signed char Q_INT8; // 8 bit signed -typedef unsigned char Q_UINT8; // 8 bit unsigned -typedef short Q_INT16; // 16 bit signed -typedef unsigned short Q_UINT16; // 16 bit unsigned -typedef int Q_INT32; // 32 bit signed -typedef unsigned int Q_UINT32; // 32 bit unsigned +typedef signed char TQ_INT8; // 8 bit signed +typedef unsigned char TQ_UINT8; // 8 bit unsigned +typedef short TQ_INT16; // 16 bit signed +typedef unsigned short TQ_UINT16; // 16 bit unsigned +typedef int TQ_INT32; // 32 bit signed +typedef unsigned int TQ_UINT32; // 32 bit unsigned #if defined(Q_OS_WIN64) -typedef __int64 Q_LONG; // word up to 64 bit signed -typedef unsigned __int64 Q_ULONG; // word up to 64 bit unsigned +typedef __int64 TQ_LONG; // word up to 64 bit signed +typedef unsigned __int64 TQ_ULONG; // word up to 64 bit unsigned #else -typedef long Q_LONG; // word up to 64 bit signed -typedef unsigned long Q_ULONG; // word up to 64 bit unsigned +typedef long TQ_LONG; // word up to 64 bit signed +typedef unsigned long TQ_ULONG; // word up to 64 bit unsigned #endif #if defined(Q_OS_WIN) && !defined(Q_CC_GNU) # define TQ_INT64_C(c) c ## i64 // signed 64 bit constant # define TQ_UINT64_C(c) c ## ui64 // unsigned 64 bit constant -typedef __int64 Q_INT64; // 64 bit signed -typedef unsigned __int64 Q_UINT64; // 64 bit unsigned +typedef __int64 TQ_INT64; // 64 bit signed +typedef unsigned __int64 TQ_UINT64; // 64 bit unsigned #else # define TQ_INT64_C(c) c ## LL // signed 64 bit constant # define TQ_UINT64_C(c) c ## ULL // unsigned 64 bit constant -typedef long long Q_INT64; // 64 bit signed -typedef unsigned long long Q_UINT64; // 64 bit unsigned +typedef long long TQ_INT64; // 64 bit signed +typedef unsigned long long TQ_UINT64; // 64 bit unsigned #endif -typedef Q_INT64 Q_LLONG; // signed long long -typedef Q_UINT64 Q_ULLONG; // unsigned long long +typedef TQ_INT64 TQ_LLONG; // signed long long +typedef TQ_UINT64 TQ_ULLONG; // unsigned long long #if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT) # define QT_LARGEFILE_SUPPORT 64 #endif #if defined(QT_LARGEFILE_SUPPORT) - typedef Q_ULLONG TQtOffset; + typedef TQ_ULLONG TQtOffset; #else - typedef Q_ULONG TQtOffset; + typedef TQ_ULONG TQtOffset; #endif |