diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2014-04-23 11:01:30 +0200 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2014-04-23 11:01:30 +0200 |
| commit | 0204e17bc656e6c59b4010283e67f9251eb12c41 (patch) | |
| tree | fa0f3f3b49701b8f008f93adeb05e526e323d5a1 | |
| parent | f4ec8ffee2a0d4414fb5f5c596ec9b2ea2533140 (diff) | |
cyassl: Use error-ssl.h when available
Versions since at least 2.9.4 renamed error.h to error-ssl.h, so use
whichever one is available.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/vtls/cyassl.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0874d2e03..e0f7f739c 100644 --- a/configure.ac +++ b/configure.ac @@ -2003,6 +2003,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined! AC_CHECK_SIZEOF(long long) + dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h + AC_CHECK_HEADERS(cyassl/error-ssl.h) + LIBS="-lcyassl -lm $LIBS" if test -n "$cyassllib"; then diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c index 6f1cea233..cf93e0ede 100644 --- a/lib/vtls/cyassl.c +++ b/lib/vtls/cyassl.c @@ -47,11 +47,16 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" -/* The last #include file should be: */ -#include "memdebug.h" + #include <cyassl/ssl.h> +#ifdef HAVE_CYASSL_ERROR_SSL_H +#include <cyassl/error-ssl.h> +#else #include <cyassl/error.h> +#endif +/* The last #include file should be: */ +#include "memdebug.h" static Curl_recv cyassl_recv; static Curl_send cyassl_send; |