Merge branch 'master' into patched-master

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/misc.h b/lib/misc.h
index 581e7a76..68ed21ce 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -28,6 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
+#include <sys/socket.h>
 
 struct ns_srv_reply {
 	int prio;
@@ -129,9 +130,6 @@ G_MODULE_EXPORT char *escape_html(const char *html);
 G_MODULE_EXPORT void http_decode(char *s);
 G_MODULE_EXPORT void http_encode(char *s);
 
-G_MODULE_EXPORT char *ipv6_wrap(char *src);
-G_MODULE_EXPORT char *ipv6_unwrap(char *src);
-
 G_MODULE_EXPORT signed int do_iconv(char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf);
 
 G_MODULE_EXPORT void random_bytes(unsigned char *buf, int count);