feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #299 from dgarske/MinGWFixes

Browse Source 
Fixes for warnings found using MinGW
This commit is contained in:
toddouska
2016-02-09 09:32:18 -08:00
parent 2e88785358 4ea76b8ac8
commit 66aa1da829
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/suites.c
View File

@ -47,9 +47,11 @@
static WOLFSSL_CTX* cipherSuiteCtx = NULL; static WOLFSSL_CTX* cipherSuiteCtx = NULL;
static char nonblockFlag[] = "-N"; static char nonblockFlag[] = "-N";
static char noVerifyFlag[] = "-d"; static char noVerifyFlag[] = "-d";
static char portFlag[] = "-p";
static char flagSep[] = " "; static char flagSep[] = " ";
static char svrPort[] = "0"; #if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_TIRTOS)
static char portFlag[] = "-p";
static char svrPort[] = "0";
#endif
#ifndef WOLFSSL_ALLOW_SSLV3 #ifndef WOLFSSL_ALLOW_SSLV3

14
wolfssl/test.h
View File

@ -134,21 +134,19 @@
/* Socket Handling */ /* Socket Handling */
#ifndef WOLFSSL_SOCKET_INVALID #ifndef WOLFSSL_SOCKET_INVALID
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
#define WOLFSSL_SOCKET_INVALID INVALID_SOCKET #define WOLFSSL_SOCKET_INVALID ((SOCKET_T)INVALID_SOCKET)
#elif defined(WOLFSSL_TIRTOS) #elif defined(WOLFSSL_TIRTOS)
#define WOLFSSL_SOCKET_INVALID -1 #define WOLFSSL_SOCKET_INVALID ((SOCKET_T)-1)
#else #else
#define WOLFSSL_SOCKET_INVALID 0 #define WOLFSSL_SOCKET_INVALID (SOCKET_T)(0)
#endif #endif
#endif /* WOLFSSL_SOCKET_INVALID */ #endif /* WOLFSSL_SOCKET_INVALID */
#ifndef WOLFSSL_SOCKET_IS_INVALID #ifndef WOLFSSL_SOCKET_IS_INVALID
#ifdef USE_WINDOWS_API #if defined(USE_WINDOWS_API) || defined(WOLFSSL_TIRTOS)
#define WOLFSSL_SOCKET_IS_INVALID(s) ((s) == WOLFSSL_SOCKET_INVALID) #define WOLFSSL_SOCKET_IS_INVALID(s) ((SOCKET_T)(s) == WOLFSSL_SOCKET_INVALID)
#elif defined(WOLFSSL_TIRTOS)
#define WOLFSSL_SOCKET_IS_INVALID(s) ((s) == WOLFSSL_SOCKET_INVALID)
#else #else
#define WOLFSSL_SOCKET_IS_INVALID(s) ((s) < WOLFSSL_SOCKET_INVALID) #define WOLFSSL_SOCKET_IS_INVALID(s) ((SOCKET_T)(s) < WOLFSSL_SOCKET_INVALID)
#endif #endif
#endif /* WOLFSSL_SOCKET_IS_INVALID */ #endif /* WOLFSSL_SOCKET_IS_INVALID */