Refactor common X/Open LFS support out of individual qplatformdefs.h

Reviewed-by: Thiago Macieira

2 files changed, 100 insertions, 41 deletions

diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h
index c8a336b..4d95fae 100644
--- a/mkspecs/common/symbian/qplatformdefs.h
+++ b/mkspecs/common/symbian/qplatformdefs.h
@@ -84,47 +84,10 @@
 #endif
 #include <arpa/inet.h>
 
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct stat64
-#define QT_STATBUF4TSTAT        struct stat64
-#define QT_STAT                 ::stat64
-#define QT_FSTAT                ::fstat64
-#define QT_LSTAT                ::lstat64
-#define QT_OPEN                 ::open64
-#define QT_TRUNCATE             ::truncate64
-#define QT_FTRUNCATE            ::ftruncate64
-#define QT_LSEEK                ::lseek64
-#else
-#define QT_STATBUF              struct stat
-#define QT_STATBUF4TSTAT        struct stat
-#define QT_STAT                 ::stat
-#define QT_FSTAT                ::fstat
-#define QT_LSTAT                ::lstat
-#define QT_OPEN                 ::open
-#define QT_TRUNCATE             ::truncate
-#define QT_FTRUNCATE            ::ftruncate
-#define QT_LSEEK                ::lseek
-#endif
+#include "../xopen-lfs/qplatformdefs.h"
 
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN                ::fopen64
-#define QT_FSEEK                ::fseeko64
-#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
-#define QT_FOPEN                ::fopen
-#define QT_FSEEK                ::fseek
-#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
+#undef QT_OPEN_LARGEFILE
+#define QT_OPEN_LARGEFILE   0
 
 #define QT_STAT_REG		S_IFREG
 #define QT_STAT_DIR		S_IFDIR
@@ -141,7 +104,6 @@
 #define QT_CHDIR		::chdir
 #define QT_MKDIR		::mkdir
 #define QT_RMDIR		::rmdir
-#define QT_OPEN_LARGEFILE	0
 #define QT_OPEN_RDONLY		O_RDONLY
 #define QT_OPEN_WRONLY		O_WRONLY
 #define QT_OPEN_RDWR		O_RDWR
diff --git a/mkspecs/common/xopen-lfs/qplatformdefs.h b/mkspecs/common/xopen-lfs/qplatformdefs.h
new file mode 100644
index 0000000..2599d62
--- /dev/null
+++ b/mkspecs/common/xopen-lfs/qplatformdefs.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef Q_XOPEN_LFS_QPLATFORMDEFS_H
+#define Q_XOPEN_LFS_QPLATFORMDEFS_H
+
+#ifdef QT_LARGEFILE_SUPPORT
+
+#define QT_STATBUF              struct stat64
+#define QT_STATBUF4TSTAT        struct stat64
+#define QT_FPOS_T               fpos64_t
+#define QT_OFF_T                off64_t
+
+#define QT_STAT                 ::stat64
+#define QT_LSTAT                ::lstat64
+#define QT_TRUNCATE             ::truncate64
+
+#define QT_OPEN                 ::open64
+#define QT_LSEEK                ::lseek64
+#define QT_FSTAT                ::fstat64
+#define QT_FTRUNCATE            ::ftruncate64
+
+#define QT_FOPEN                ::fopen64
+#define QT_FSEEK                ::fseeko64
+#define QT_FTELL                ::ftello64
+#define QT_FGETPOS              ::fgetpos64
+#define QT_FSETPOS              ::fsetpos64
+
+#define QT_MMAP                 ::mmap64
+
+#else // !QT_LARGEFILE_SUPPORT
+
+#define QT_STATBUF              struct stat
+#define QT_STATBUF4TSTAT        struct stat
+#define QT_FPOS_T               fpos_t
+#define QT_OFF_T                long
+
+#define QT_STAT                 ::stat
+#define QT_LSTAT                ::lstat
+#define QT_TRUNCATE             ::truncate
+
+#define QT_OPEN                 ::open
+#define QT_LSEEK                ::lseek
+#define QT_FSTAT                ::fstat
+#define QT_FTRUNCATE            ::ftruncate
+
+#define QT_FOPEN                ::fopen
+#define QT_FSEEK                ::fseek
+#define QT_FTELL                ::ftell
+#define QT_FGETPOS              ::fgetpos
+#define QT_FSETPOS              ::fsetpos
+
+#define QT_MMAP                 ::mmap
+
+#endif // QT_LARGEFILE_SUPPORT
+
+#define QT_OPEN_LARGEFILE       O_LARGEFILE
+
+#endif // include guard