base64: correct linkage of base64_maps_rfc4648

Two copies of this map meant only the tests would ever work.

diff --git a/ccan/base64/base64.c b/ccan/base64/base64.c
index af078bc76ef5d6535b48ed15fb70e07f5f454bfa..a216f4781a504207097a01aacb937e6625d5f855 100644 (file)
--- a/ccan/base64/base64.c
+++ b/ccan/base64/base64.c
@@ -209,7 +209,7 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps,
 /**
  * base64_maps_rfc4648 - pregenerated maps struct for rfc4648
  */
-static const base64_maps_t base64_maps_rfc4648 = {
+const base64_maps_t base64_maps_rfc4648 = {
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
 
   "\xff\xff\xff\xff\xff" /* 0 */                                       \

diff --git a/ccan/base64/base64.h b/ccan/base64/base64.h
index 283c6e441f36ede0028f97e366dffe7229241bcd..405dc63fd44531d9bcfb55064ad3a0196f68f0dc 100644 (file)
--- a/ccan/base64/base64.h
+++ b/ccan/base64/base64.h
@@ -122,7 +122,7 @@ int base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest,
 
 /* the rfc4648 functions: */
 
-static const base64_maps_t base64_maps_rfc4648;
+extern const base64_maps_t base64_maps_rfc4648;
 
 /**
  * base64_encode - Encode a buffer into base64 according to rfc4648