Merge branch 'master' of github.com:wolfSSL/wolfssl

This commit is contained in:
John Safranek
2015-01-30 09:56:35 -08:00
2 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@
#define CYASSL_ENTER WOLFSSL_ENTER
#define CYASSL_MSG WOLFSSL_MSG
/* check old macros possibly declared */
#if defined(CYASSL_DEBUG) && !defined(DEBUG_WOLFSSL)
#if defined(DEBUG_CYASSL) && !defined(DEBUG_WOLFSSL)
#define DEBUG_WOLFSSL
#endif

View File

@ -48,7 +48,7 @@
#endif
#define CYASSL WOLFSSL
#define CYASSL_DEBUG WOLFSSL_DEBUG
#define DEBUG_CYASSL DEBUG_WOLFSSL
#define CYASSL_CTX WOLFSSL_CTX
#define CYASSL_METHOD WOLFSSL_METHOD
#define CYASSL_SESSION WOLFSSL_SESSION