diff --git a/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h b/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h index 2c7e27aff..615c3ba9b 100644 --- a/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h +++ b/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h @@ -68,7 +68,6 @@ typedef int socklen_t ; #define tcp_connect wolfssl_tcp_connect #define tcp_socket wolfssl_tcp_soket #define tcp_listen wolfssl_tcp_listen -#define tcp_select wolfssl_tcp_select #define connect(a,b,c) connect(a, (SOCKADDR *)(b), c) #define SOCKADDR struct sockaddr diff --git a/wolfssl/test.h b/wolfssl/test.h index 7ba0e4624..660bdd323 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -61,9 +61,6 @@ #elif defined (WOLFSSL_CMSIS_RTOS) #define sleep(t) osDelay(t/1000+1) ; #endif - - static int wolfssl_tcp_select(int sd, int timeout) - { return 0 ; } #elif defined(WOLFSSL_TIRTOS) #include #include @@ -820,7 +817,7 @@ static INLINE int tcp_select(SOCKET_T socketfd, int to_sec) return TEST_SELECT_FAIL; } -#elif defined(WOLFSSL_TIRTOS) +#elif defined(WOLFSSL_TIRTOS) || defined(WOLFSSL_KEIL_TCP_NET) static INLINE int tcp_select(SOCKET_T socketfd, int to_sec) { return TEST_RECV_READY; diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h index 0efa1a803..65235132b 100644 --- a/wolfssl/wolfio.h +++ b/wolfssl/wolfio.h @@ -62,7 +62,7 @@ #include #elif defined(FREESCALE_KSDK_MQX) #include - #elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET))&& defined(WOLFSSL_CMSIS_RTOS) + #elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)) #include "cmsis_os.h" #include "rl_net.h" #include "errno.h"