Revert "plain_mem_funcs_user_arg need not be exposed"

This reverts commit d0ff5d8fea.

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.
This commit is contained in:
Willem Toorop 2015-08-24 14:37:02 +02:00
parent d0ff5d8fea
commit f312a6cfc5
4 changed files with 5 additions and 3 deletions

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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 {