--- a/mkspecs/win32-icc/qplatformdefs.h Wed Jun 23 19:07:03 2010 +0300
+++ b/mkspecs/win32-icc/qplatformdefs.h Tue Jul 06 15:10:48 2010 +0300
@@ -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