Remove QT_READDIR_R macro from qplatformdefs.h
readdir_r() has been deprecated since glibc-2.24; all usage of QT_READDIR_R in qtbase has been ported to readdir() since 2016 4b6784b49c6dcf0add9ec0cbb4ad97cd191c2aa3 (which explains in details the reasons behind the deprecation). What's left is the QT_READDIR_R, user code that still uses it, can switch to readdir_r() (which is not advisable). [ChangeLog][QtCore] Removed QT_READDIR_R macro; readdir_r() has been deprecated since glibc-2.24 and it's recommended to use readdir() instead. For more details see: https://man7.org/linux/man-pages/man3/readdir_r.3.html Change-Id: Icca2dca7e696533dcb983a82ba97a13baadcf015 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
bd07335554
commit
366657b951
@ -116,11 +116,9 @@
|
||||
&& !defined(QT_NO_READDIR64)
|
||||
#define QT_DIRENT struct dirent64
|
||||
#define QT_READDIR ::readdir64
|
||||
#define QT_READDIR_R ::readdir64_r
|
||||
#else
|
||||
#define QT_DIRENT struct dirent
|
||||
#define QT_READDIR ::readdir
|
||||
#define QT_READDIR_R ::readdir_r
|
||||
#endif
|
||||
|
||||
#define QT_SOCKET_CONNECT ::connect
|
||||
|
@ -93,11 +93,9 @@
|
||||
&& !defined(QT_NO_READDIR64)
|
||||
#define QT_DIRENT struct dirent64
|
||||
#define QT_READDIR ::readdir64
|
||||
#define QT_READDIR_R ::readdir64_r
|
||||
#else
|
||||
#define QT_DIRENT struct dirent
|
||||
#define QT_READDIR ::readdir
|
||||
#define QT_READDIR_R ::readdir_r
|
||||
#endif
|
||||
|
||||
#define QT_SOCKET_CONNECT ::connect
|
||||
|
@ -108,11 +108,9 @@
|
||||
&& !defined(QT_NO_READDIR64)
|
||||
#define QT_DIRENT struct dirent64
|
||||
#define QT_READDIR ::readdir64
|
||||
#define QT_READDIR_R ::readdir64_r
|
||||
#else
|
||||
#define QT_DIRENT struct dirent
|
||||
#define QT_READDIR ::readdir
|
||||
#define QT_READDIR_R ::readdir_r
|
||||
#endif
|
||||
|
||||
#define QT_SOCKLEN_T socklen_t
|
||||
|
@ -46,11 +46,6 @@
|
||||
#define QT_NO_READDIR64
|
||||
#endif
|
||||
#include "../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_VSNPRINTF ::vsnprintf
|
||||
|
@ -120,11 +120,9 @@
|
||||
&& !defined(QT_NO_READDIR64)
|
||||
#define QT_DIRENT struct dirent64
|
||||
#define QT_READDIR ::readdir64
|
||||
#define QT_READDIR_R ::readdir64_r
|
||||
#else
|
||||
#define QT_DIRENT struct dirent
|
||||
#define QT_READDIR ::readdir
|
||||
#define QT_READDIR_R ::readdir_r
|
||||
#endif
|
||||
|
||||
#define QT_SOCKET_CONNECT ::connect
|
||||
|
Loading…
x
Reference in New Issue
Block a user