hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCC 7 and OpenSSL 1.1 build failures

Browse Source 
Fedora 26 and Debian 9 have both GCC 7 and OpenSSL 1.1. These fixes add
support for the newer versions of these libraries.
This commit is contained in:
Markus Mäkelä
2017-07-22 22:05:07 +03:00
parent 07a5cba2de
commit f76e4cd61d
7 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/ssl.h
View File

@ -31,7 +31,9 @@ struct dcb;
typedef enum ssl_method_type
{
#ifndef OPENSSL_1_1
SERVICE_TLS10,
#endif
#ifdef OPENSSL_1_0
SERVICE_TLS11,
SERVICE_TLS12,

2
include/maxscale/utils.h
View File

@ -24,7 +24,7 @@
MXS_BEGIN_DECLS
#define CALCLEN(i) ((size_t)(floor(log10(abs(i))) + 1))
#define CALCLEN(i) ((size_t)(floor(log10(abs((int64_t)i))) + 1))
#define UINTLEN(i) (i<10 ? 1 : (i<100 ? 2 : (i<1000 ? 3 : CALCLEN(i))))
#define MXS_ARRAY_NELEMS(array) ((size_t)(sizeof(array)/sizeof(array[0])))