From 366657b95113a06ac5432839ec73121cc8631a42 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Fri, 2 Feb 2024 01:28:04 +0200 Subject: 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 Reviewed-by: Joerg Bornemann --- mkspecs/common/android/qplatformdefs.h | 2 -- mkspecs/common/posix/qplatformdefs.h | 2 -- mkspecs/common/qnx/qplatformdefs.h | 5 ----- mkspecs/common/wasm/qplatformdefs.h | 2 -- 4 files changed, 11 deletions(-) (limited to 'mkspecs/common') diff --git a/mkspecs/common/android/qplatformdefs.h b/mkspecs/common/android/qplatformdefs.h index 837a7952e4..41b7315cef 100644 --- a/mkspecs/common/android/qplatformdefs.h +++ b/mkspecs/common/android/qplatformdefs.h @@ -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 diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h index ffae2ac37a..e7ce7a568d 100644 --- a/mkspecs/common/posix/qplatformdefs.h +++ b/mkspecs/common/posix/qplatformdefs.h @@ -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 diff --git a/mkspecs/common/qnx/qplatformdefs.h b/mkspecs/common/qnx/qplatformdefs.h index b608b86fbd..285301b157 100644 --- a/mkspecs/common/qnx/qplatformdefs.h +++ b/mkspecs/common/qnx/qplatformdefs.h @@ -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 diff --git a/mkspecs/common/wasm/qplatformdefs.h b/mkspecs/common/wasm/qplatformdefs.h index 45545713df..99087a2044 100644 --- a/mkspecs/common/wasm/qplatformdefs.h +++ b/mkspecs/common/wasm/qplatformdefs.h @@ -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 -- cgit v1.2.3