moving WOLFSSH_TEST guard into test.h

pull/292/head
Takashi Kojo 2020-10-11 11:54:39 +09:00
parent 28b8e745b1
commit 69791e1ff2
2 changed files with 3 additions and 10 deletions

View File

@ -18,10 +18,8 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FREESCALE_MQX
#define WOLFSSH_TEST_SERVER
#define WOLFSSH_TEST_ECHOSERVER
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -42,11 +40,6 @@
#include <wolfssh/test.h>
#include <wolfssl/wolfcrypt/ecc.h>
#ifdef FREESCALE_MQX
#define WOLFSSH_TEST_SERVER
#define WOLFSSH_TEST_ECHOSERVER
#endif
#include "examples/echoserver/echoserver.h"
#if defined(WOLFSSL_PTHREADS) && defined(WOLFSSL_TEST_GLOBAL_REQ)

View File

@ -323,7 +323,7 @@ static INLINE int mygetopt(int argc, char** argv, const char* optstring)
* - 4996: deprecated function */
#endif
#if defined(WOLFSSH_TEST_CLIENT) || defined(WOLFSSH_TEST_SERVER)
#if (defined(WOLFSSH_TEST_CLIENT) || defined(WOLFSSH_TEST_SERVER)) && !defined(FREESCALE_MQX)
#ifdef WOLFSSL_NUCLEUS
static INLINE void build_addr(struct addr_struct* addr, const char* peer,
@ -534,7 +534,7 @@ static INLINE void tcp_socket(WS_SOCKET_T* sockFd)
#endif
#ifdef WOLFSSH_TEST_SERVER
#if defined(WOLFSSH_TEST_SERVER) && !defined(FREESCALE_MQX)
static INLINE void tcp_listen(WS_SOCKET_T* sockfd, word16* port, int useAnyAddr)
{
@ -607,7 +607,7 @@ enum {
WS_SELECT_ERROR_READY
};
#if (defined(WOLFSSH_TEST_SERVER) || defined(WOLFSSH_TEST_CLIENT))
#if (defined(WOLFSSH_TEST_SERVER) || defined(WOLFSSH_TEST_CLIENT)) && !defined(FREESCALE_MQX)
static INLINE void tcp_set_nonblocking(WS_SOCKET_T* sockfd)
{