From: Zebediah Figura Subject: [PATCH 2/4] include: Allow using Windows sockets on Unix. Message-Id: <20220110233107.97773-2-zfigura@codeweavers.com> Date: Mon, 10 Jan 2022 17:31:05 -0600 In-Reply-To: <20220110233107.97773-1-zfigura@codeweavers.com> References: <20220110233107.97773-1-zfigura@codeweavers.com> By explicitly defining WINELIB_USE_WINSOCK. Signed-off-by: Zebediah Figura --- include/af_irda.h | 3 ++- include/in6addr.h | 3 ++- include/inaddr.h | 3 ++- include/mswsock.h | 3 ++- include/winsock.h | 3 ++- include/winsock2.h | 3 ++- include/wsipx.h | 3 ++- include/wsnwlink.h | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/af_irda.h b/include/af_irda.h index 6a6dca83079..80ce7e1d6b8 100644 --- a/include/af_irda.h +++ b/include/af_irda.h @@ -18,7 +18,8 @@ #ifndef AF_IRDA_H #define AF_IRDA_H -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/in6addr.h b/include/in6addr.h index 663478fea12..07f95d7ef64 100644 --- a/include/in6addr.h +++ b/include/in6addr.h @@ -19,7 +19,8 @@ #ifndef __IN6ADDR__ #define __IN6ADDR__ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/inaddr.h b/include/inaddr.h index 078c031ad0d..9c88c32864d 100644 --- a/include/inaddr.h +++ b/include/inaddr.h @@ -20,7 +20,8 @@ #ifndef __INADDR_H__ #define __INADDR_H__ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/mswsock.h b/include/mswsock.h index 4afd8a7ceb1..5a216a80c13 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -18,7 +18,8 @@ #ifndef _MSWSOCK_ #define _MSWSOCK_ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/winsock.h b/include/winsock.h index 6afe00e8bd7..d6160bea446 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -24,7 +24,8 @@ # error Please use winsock2 in Wine #endif -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/winsock2.h b/include/winsock2.h index 9923ea0f6d1..31b7bd13675 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/wsipx.h b/include/wsipx.h index 56395e26456..215aa155a12 100644 --- a/include/wsipx.h +++ b/include/wsipx.h @@ -19,7 +19,8 @@ #ifndef _WINE_WSIPX_ #define _WINE_WSIPX_ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif diff --git a/include/wsnwlink.h b/include/wsnwlink.h index 161f9366df8..c960b8eb7cd 100644 --- a/include/wsnwlink.h +++ b/include/wsnwlink.h @@ -19,7 +19,8 @@ #ifndef _WSNWLINK_ #define _WSNWLINK_ -#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && \ + !defined(__WINE_USE_MSVCRT) && !defined(WINELIB_USE_WINSOCK) #define USE_WS_PREFIX #endif -- 2.34.1