From af3e13994115416301f2298f6dc01e4d4356ae35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Matysiak?= Date: Mon, 25 Sep 2023 08:24:54 +0200 Subject: [PATCH] Remove obsolete code related to ioctl on vxworks Previous implementation of qt_safe_ioctl mentioned that vxworks defines ioctl in a non-standard way. As of VxWorks 23.03 ioctl is now properly defined so the comment and check in the code are obsolete. Task-number: QTBUG-115777 Change-Id: I0fdf614e45063b031e2c998339d6987ba69167ca Reviewed-by: Thiago Macieira --- src/network/socket/qnet_unix_p.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h index c72e5745b0..9459c98d1a 100644 --- a/src/network/socket/qnet_unix_p.h +++ b/src/network/socket/qnet_unix_p.h @@ -124,15 +124,10 @@ static inline int qt_safe_connect(int sockfd, const struct sockaddr *addr, QT_SO # undef listen #endif -// VxWorks' headers specify 'int' instead of '...' for the 3rd ioctl() parameter. template static inline int qt_safe_ioctl(int sockfd, unsigned long request, T arg) { -#ifdef Q_OS_VXWORKS - return ::ioctl(sockfd, request, (int) arg); -#else return ::ioctl(sockfd, request, arg); -#endif } static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags)