1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Make use of _readdir64_r

Browse Source 
Latest QNX versions support _readdir64_r. It will be used by
QFileSystemIterator now, when available to support large file
systems.

Change-Id: I40135f405ad72e1ba85c6a4cd282144dd8171bc6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Bernd Weimer 2013-11-21 18:54:44 +01:00 committed by The Qt Project
parent 92b2275c3d
commit 5d8c05baf4
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
View File

@ -83,8 +83,15 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#define QT_USE_XOPEN_LFS_EXTENSIONS #define QT_USE_XOPEN_LFS_EXTENSIONS
#if !defined(__EXT_QNX__READDIR64_R)
#define QT_NO_READDIR64 #define QT_NO_READDIR64
#endif
#include "../common/posix/qplatformdefs.h" #include "../common/posix/qplatformdefs.h"
#if defined(__EXT_QNX__READDIR64_R)
#define QT_EXT_QNX_READDIR_R ::_readdir64_r
#elif defined(__EXT_QNX__READDIR_R)
#define QT_EXT_QNX_READDIR_R ::_readdir_r
#endif
#define QT_SNPRINTF ::snprintf #define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf #define QT_VSNPRINTF ::vsnprintf

7
mkspecs/qnx-x86-qcc/qplatformdefs.h
View File

@ -83,8 +83,15 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#define QT_USE_XOPEN_LFS_EXTENSIONS #define QT_USE_XOPEN_LFS_EXTENSIONS
#if !defined(__EXT_QNX__READDIR64_R)
#define QT_NO_READDIR64 #define QT_NO_READDIR64
#endif
#include "../common/posix/qplatformdefs.h" #include "../common/posix/qplatformdefs.h"
#if defined(__EXT_QNX__READDIR64_R)
#define QT_EXT_QNX_READDIR_R ::_readdir64_r
#elif defined(__EXT_QNX__READDIR_R)
#define QT_EXT_QNX_READDIR_R ::_readdir_r
#endif
#define QT_SNPRINTF ::snprintf #define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf #define QT_VSNPRINTF ::vsnprintf

4
src/corelib/io/qfilesystemiterator_unix.cpp
View File

@ -105,8 +105,8 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa
if (!dir) if (!dir)
return false; return false;
#if defined(Q_OS_QNX) && defined(__EXT_QNX__READDIR_R) #if defined(Q_OS_QNX) && defined(QT_EXT_QNX_READDIR_R)
lastError = _readdir_r(dir, mt_file.data(), &dirEntry, direntSize); lastError = QT_EXT_QNX_READDIR_R(dir, mt_file.data(), &dirEntry, direntSize);
if (lastError) if (lastError)
return false; return false;
#elif defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) #elif defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)