wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8491 from jmalak/winsock-guard

Browse Source 
correct comment for _WINSOCKAPI_ macro manipulation
This commit is contained in:
David Garske
2025-02-25 09:51:23 -08:00
committed by GitHub
parent 0589a34f91 d066e6b9a5
commit 4eda5e1f7f
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl_load.c
View File

@ -38,7 +38,7 @@
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#include <wincrypt.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
/* mingw gcc does not support pragma comment, and the
* linking with crypt32 is handled in configure.ac */

2
wolfcrypt/benchmark/benchmark.c
View File

@ -14584,7 +14584,7 @@ void bench_sphincsKeySign(byte level, byte optim)
#define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
double current_time(int reset)
{

2
wolfcrypt/src/random.c
View File

@ -90,7 +90,7 @@ This library contains implementation for the random number generator.
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#include <wincrypt.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(HAVE_WNR)
#include <wnr.h>
#include <wolfssl/wolfcrypt/logging.h>

4
wolfssl/internal.h
View File

@ -156,7 +156,7 @@
#elif defined(__NT__)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(__LINUX__)
#ifndef SINGLE_THREADED
#define WOLFSSL_PTHREADS
@ -169,7 +169,7 @@
#else
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#endif
#elif defined(THREADX)
#ifndef SINGLE_THREADED

2
wolfssl/test.h
View File

@ -2124,7 +2124,7 @@ static WC_INLINE unsigned int my_psk_client_cs_cb(WOLFSSL* ssl,
#define WIN32_LEAN_AND_MEAN
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
static WC_INLINE double current_time(int reset)
{

6
wolfssl/wolfcrypt/wc_port.h
View File

@ -125,6 +125,7 @@
#if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#include <process.h>
#elif defined(__OS2__)
#define INCL_DOSSEMAPHORES
@ -143,6 +144,7 @@
#if defined(USE_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#elif defined(__OS2__)
#include <os2.h>
#endif
@ -162,8 +164,7 @@
#if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */
#include <windows.h>
/* winsock2.h expects _WINSOCKAPI_ to be undef, and defines it. */
#undef _WINSOCKAPI_
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#ifndef WOLFSSL_USER_IO
#include <winsock2.h>
#include <ws2tcpip.h> /* required for InetPton */
@ -1218,6 +1219,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#elif defined(_WIN32_WCE)
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
#include <windows.h>
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
#include <stdlib.h> /* For file system */
time_t windows_time(time_t* timer);