diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-09-07 19:16:43 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:51:52 +0200 |
commit | 0aa6817e861bf9f63c819c60077921d53b90727b (patch) | |
tree | aa9992c1f6c43eabf2dac91f68182548edcd88fb /unittest | |
parent | 5ea5a7f7e79d78920fa76527fadfbec0c87f24c8 (diff) | |
download | mariadb-git-0aa6817e861bf9f63c819c60077921d53b90727b.tar.gz |
name clash with gnutls on on base64_encode
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/mysys/base64-t.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c index 1cf54f9b673..97558083bef 100644 --- a/unittest/mysys/base64-t.c +++ b/unittest/mysys/base64-t.c @@ -49,18 +49,18 @@ main(int argc __attribute__((unused)),char *argv[]) } /* Encode */ - needed_length= base64_needed_encoded_length(src_len); + needed_length= my_base64_needed_encoded_length(src_len); str= (char *) malloc(needed_length); for (k= 0; k < needed_length; k++) str[k]= 0xff; /* Fill memory to check correct NUL termination */ - ok(base64_encode(src, src_len, str) == 0, - "base64_encode: size %d", i); + ok(my_base64_encode(src, src_len, str) == 0, + "my_base64_encode: size %d", i); ok(needed_length == strlen(str) + 1, - "base64_needed_encoded_length: size %d", i); + "my_base64_needed_encoded_length: size %d", i); /* Decode */ - dst= (char *) malloc(base64_needed_decoded_length(strlen(str))); - dst_len= base64_decode(str, strlen(str), dst, NULL, 0); + dst= (char *) malloc(my_base64_needed_decoded_length(strlen(str))); + dst_len= my_base64_decode(str, strlen(str), dst, NULL, 0); ok(dst_len == src_len, "Comparing lengths"); cmp= memcmp(src, dst, src_len); |