diff options
| author | João Abecasis <joao@trolltech.com> | 2010-01-15 11:26:17 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@trolltech.com> | 2010-01-22 16:50:19 (GMT) |
| commit | 784946b8ea8b932924a831504387661d66170ca0 (patch) | |
| tree | 4e369a848b163d6f28e23f4ff065cc0999a1d60a /mkspecs/win32-icc | |
| parent | 44232675a87c766b48d8f3d70d04dee6538a6caf (diff) | |
| download | Qt-784946b8ea8b932924a831504387661d66170ca0.zip Qt-784946b8ea8b932924a831504387661d66170ca0.tar.gz Qt-784946b8ea8b932924a831504387661d66170ca0.tar.bz2 | |
Refactor common C89 support out of individual qplatformdefs.h
Reviewed-by: Thiago Macieira
Diffstat (limited to 'mkspecs/win32-icc')
| -rw-r--r-- | mkspecs/win32-icc/qplatformdefs.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h index 6abfef2..833846f 100644 --- a/mkspecs/win32-icc/qplatformdefs.h +++ b/mkspecs/win32-icc/qplatformdefs.h @@ -113,21 +113,19 @@ # define QT_OPEN_BINARY _O_BINARY #endif -#define QT_FOPEN ::fopen +#include "../common/c89/qplatformdefs.h" + #if defined(QT_LARGEFILE_SUPPORT) && _MSC_VER > 1310 +#undef QT_FSEEK +#undef QT_FTELL + #define QT_FSEEK ::_fseeki64 #define QT_FTELL ::_ftelli64 -#else -#define QT_FSEEK ::fseek -#define QT_FTELL ::ftell #endif -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_FPOS_T fpos_t -#ifdef QT_LARGEFILE_SUPPORT + +#if defined(QT_LARGEFILE_SUPPORT) +#undef QT_OFF_T #define QT_OFF_T __int64 -#else -#define QT_OFF_T long #endif #define QT_SIGNAL_ARGS int |