From: Evan Hunt <each@isc.org>
Date: Wed, 13 Apr 2016 17:12:21 +0000 (-0700)
Subject: [master] fix dns_dtmsg_t type redefinition
X-Git-Tag: v9.11.0a2~88
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5fdf476b3259f76bf1da2726a3fa3476b6f1b744;p=thirdparty%2Fbind9.git

[master] fix dns_dtmsg_t type redefinition
---

diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index e6c5e145293..a673c44c3a5 100644
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -71,6 +71,7 @@
 #include <dns/message.h>
 #include <dns/rdataset.h>
 #include <dns/result.h>
+#include <dns/types.h>
 #include <dns/view.h>
 
 #include <dns/dnstap.pb-c.h>
@@ -82,12 +83,12 @@
 #define DNSTAP_CONTENT_TYPE	"protobuf:dnstap.Dnstap"
 #define DNSTAP_INITIAL_BUF_SIZE 256
 
-typedef struct dns_dtmsg {
+struct dns_dtmsg {
 	void *buf;
 	size_t len;
 	Dnstap__Dnstap d;
 	Dnstap__Message m;
-} dns_dtmsg_t;
+};
 
 #define CHECK(x) do { \
 	result = (x); \