From 8b2b12b454b1465f6c56e75d2ef57743600318c5 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Thu, 14 Jun 2018 15:09:08 +0100 Subject: [PATCH] fix _IOC cast --- nx/external/bsd/include/sys/ioccom.h | 2 +- nx/source/runtime/devices/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nx/external/bsd/include/sys/ioccom.h b/nx/external/bsd/include/sys/ioccom.h index eaaf8089..d105a005 100644 --- a/nx/external/bsd/include/sys/ioccom.h +++ b/nx/external/bsd/include/sys/ioccom.h @@ -55,7 +55,7 @@ #define IOC_INOUT (IOC_IN|IOC_OUT) #define IOC_DIRMASK (IOC_VOID|IOC_OUT|IOC_IN) -#define _IOC(inout,group,num,len) ((unsigned long) \ +#define _IOC(inout,group,num,len) ((int) \ ((inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | (num))) #define _IO(g,n) _IOC(IOC_VOID, (g), (n), 0) #define _IOWINT(g,n) _IOC(IOC_VOID, (g), (n), sizeof(int)) diff --git a/nx/source/runtime/devices/socket.c b/nx/source/runtime/devices/socket.c index cb19a7b7..f438f680 100644 --- a/nx/source/runtime/devices/socket.c +++ b/nx/source/runtime/devices/socket.c @@ -547,7 +547,7 @@ int ioctl(int fd, int request, ...) { return -1; } - fd = request == FIONBIO ? _socketGetFd(fd) : fd; + fd = request != FIONBIO ? _socketGetFd(fd) : fd; if(fd == -1) return -1;