From f312a6cfc5ea110a7dedb29a16c44009dd067d2e Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 24 Aug 2015 14:37:02 +0200
Subject: [PATCH] Revert "plain_mem_funcs_user_arg need not be exposed"

This reverts commit d0ff5d8fea4b280a09fbd857a88b85de01bc7045.

It does need to be exposed and is used inderectly through GETDNS_MALLOC which uses MF_PLAIN which is an alias for plain_mem_funcs_user_arg.
---
 src/context.c         | 2 +-
 src/libgetdns.symbols | 1 +
 src/mk-symfiles.sh    | 1 +
 src/types-internal.h  | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/context.c b/src/context.c
index 4263c143..d469744b 100644
--- a/src/context.c
+++ b/src/context.c
@@ -61,7 +61,7 @@
 #define GETDNS_STR_PORT_DNS "53"
 #define GETDNS_STR_PORT_DNS_OVER_TLS "1021"
 
-void *_getdns_plain_mem_funcs_user_arg = MF_PLAIN;
+void *plain_mem_funcs_user_arg = MF_PLAIN;
 
 typedef struct host_name_addrs {
 	_getdns_rbnode_t node;
diff --git a/src/libgetdns.symbols b/src/libgetdns.symbols
index c2d24283..3eb60c4a 100644
--- a/src/libgetdns.symbols
+++ b/src/libgetdns.symbols
@@ -114,4 +114,5 @@ getdns_snprint_json_dict
 getdns_snprint_json_list
 getdns_strerror
 getdns_validate_dnssec
+plain_mem_funcs_user_arg
 priv_getdns_context_mf
diff --git a/src/mk-symfiles.sh b/src/mk-symfiles.sh
index 80221f6b..35bda5cb 100755
--- a/src/mk-symfiles.sh
+++ b/src/mk-symfiles.sh
@@ -8,6 +8,7 @@ write_symbols() {
 }
 
 write_symbols libgetdns.symbols getdns/getdns.h.in getdns/getdns_extra.h
+echo plain_mem_funcs_user_arg >> libgetdns.symbols
 echo priv_getdns_context_mf >> libgetdns.symbols
 write_symbols extension/libevent.symbols getdns/getdns_ext_libevent.h
 write_symbols extension/libev.symbols getdns/getdns_ext_libev.h
diff --git a/src/types-internal.h b/src/types-internal.h
index 7896dc22..5750fdc5 100644
--- a/src/types-internal.h
+++ b/src/types-internal.h
@@ -111,8 +111,8 @@ struct getdns_network_req;
 
 typedef void (*internal_cb_t)(struct getdns_dns_req *dns_req);
 
-#define MF_PLAIN ((void *)&_getdns_plain_mem_funcs_user_arg)
-extern void *_getdns_plain_mem_funcs_user_arg;
+#define MF_PLAIN ((void *)&plain_mem_funcs_user_arg)
+extern void *plain_mem_funcs_user_arg;
 
 typedef union {
         struct {