AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete code related to ioctl on vxworks

Browse Source 
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 <thiago.macieira@intel.com>
This commit is contained in:
Łukasz Matysiak 2023-09-25 08:24:54 +02:00 committed by Łukasz Matysiak
parent 3b655bcda7
commit af3e139941
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/socket/qnet_unix_p.h
View File

@ -124,15 +124,10 @@ static inline int qt_safe_connect(int sockfd, const struct sockaddr *addr, QT_SO
# undef listen # undef listen
#endif #endif
// VxWorks' headers specify 'int' instead of '...' for the 3rd ioctl() parameter.
template <typename T> template <typename T>
static inline int qt_safe_ioctl(int sockfd, unsigned long request, T arg) 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); return ::ioctl(sockfd, request, arg);
#endif
} }
static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags) static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags)