From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Fri, 7 Sep 2018 09:21:00 +0000 (+0200)
Subject: libdnssec: remove base64 workaround in binary
X-Git-Tag: v2.8.0~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10c86c51db593e2fcda1cc2d8db9ffaf95d3dd4a;p=thirdparty%2Fknot-dns.git

libdnssec: remove base64 workaround in binary
---

diff --git a/src/libdnssec/binary.c b/src/libdnssec/binary.c
index 4fec6f6cac..4afdbc6064 100644
--- a/src/libdnssec/binary.c
+++ b/src/libdnssec/binary.c
@@ -17,17 +17,11 @@
 #include <assert.h>
 #include <string.h>
 
+#include "contrib/base64.h"
 #include "libdnssec/binary.h"
 #include "libdnssec/error.h"
 #include "libdnssec/shared/shared.h"
 
-// Workaround for symbol redefinition if linked statically.
-#define base64_encode base64encode
-#define base64_decode base64decode
-#define base64_encode_alloc base64encodealloc
-#define base64_decode_alloc base64decodealloc
-#include "contrib/base64.c"
-
 /* -- public API ----------------------------------------------------------- */
 
 _public_