diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
| commit | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (patch) | |
| tree | 0684ab4a4e02dc72c2e1f5bc72baaf55f0d0310f /mkspecs/aix-xlc/qplatformdefs.h | |
| parent | cd58bc13a4a37543d76a79b3cee7cd95bde0a14b (diff) | |
| parent | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (diff) | |
| download | Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.zip Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.gz Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'mkspecs/aix-xlc/qplatformdefs.h')
| -rw-r--r-- | mkspecs/aix-xlc/qplatformdefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index b162513..3856600 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h @@ -105,6 +105,7 @@ #define QT_FTELL ::ftello64 #define QT_FGETPOS ::fgetpos64 #define QT_FSETPOS ::fsetpos64 +#define QT_MMAP ::mmap64 #define QT_FPOS_T fpos64_t #define QT_OFF_T off64_t #else @@ -113,6 +114,7 @@ #define QT_FTELL ::ftell #define QT_FGETPOS ::fgetpos #define QT_FSETPOS ::fsetpos +#define QT_MMAP ::mmap #define QT_FPOS_T fpos_t #define QT_OFF_T long #endif |