moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

cyassl: Use error-ssl.h when available

Browse Source 
Versions since at least 2.9.4 renamed error.h to error-ssl.h, so use
whichever one is available.
This commit is contained in:
Dan Fandrich 2014-04-23 11:01:30 +02:00
parent f4ec8ffee2
commit 0204e17bc6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2003,6 +2003,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined! dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
AC_CHECK_SIZEOF(long long) 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" LIBS="-lcyassl -lm $LIBS"
if test -n "$cyassllib"; then if test -n "$cyassllib"; then

11
lib/vtls/cyassl.c
View File

@ -47,11 +47,16 @@
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
#include "curl_memory.h" #include "curl_memory.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: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#include <cyassl/ssl.h>
#include <cyassl/error.h>
static Curl_recv cyassl_recv; static Curl_recv cyassl_recv;
static Curl_send cyassl_send; static Curl_send cyassl_send;