summaryrefslogtreecommitdiff
path: root/mysys_ssl
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-07-12 22:39:58 +0200
committerSergei Golubchik <serg@mariadb.org>2017-07-13 09:14:17 +0200
commit7fc75c420a47fd29a399468b920641ebb43fa75c (patch)
tree2d6dc918c97f2c2542f1814cc7fe87d831495b78 /mysys_ssl
parent1d730ac42d58b5364690634260f915daea659259 (diff)
downloadmariadb-git-7fc75c420a47fd29a399468b920641ebb43fa75c.tar.gz
fix compilation with OpenSSL 1.1
Diffstat (limited to 'mysys_ssl')
-rw-r--r--mysys_ssl/openssl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
index 31d29fb06d9..34f4d629ba6 100644
--- a/mysys_ssl/openssl.c
+++ b/mysys_ssl/openssl.c
@@ -34,7 +34,8 @@ int check_openssl_compatibility()
static uint testing, alloc_size, alloc_count;
-static void *coc_malloc(size_t size, const char *, int)
+static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
+ int l __attribute__((unused)))
{
if (unlikely(testing))
{