From: Christoph Egger <christoph@debian.org>
Date: Mon, 29 Aug 2016 23:57:45 +0000 (+0200)
Subject: Move ldns/rr.h import up a bit
X-Git-Tag: release-1.7.0-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7514f30fa9de7341544deb3dc592c00bacef2ba;p=thirdparty%2Fldns.git

Move ldns/rr.h import up a bit

Newer versions of SWIG seem to be more sensitive to ordering here. Fixes
import errors where LDNS_RR_* constants are used before they are
actually initialized.
---

diff --git a/contrib/python/ldns.i b/contrib/python/ldns.i
index 35e076f8..562b3ec9 100644
--- a/contrib/python/ldns.i
+++ b/contrib/python/ldns.i
@@ -139,6 +139,8 @@ uint32_t ldns_read_timeval_usec(struct timeval* t) {
 %include "ldns_resolver.i"
 %include "ldns_rr.i"
 
+%include <ldns/rr.h>
+
 %inline %{
 int Python_str_Check(PyObject *o) {
 #if PY_VERSION_HEX>=0x03000000
@@ -168,7 +170,6 @@ int Python_str_Check(PyObject *o) {
   %include <ldns/packet.h>
   %include <ldns/rdata.h>
   %include <ldns/resolver.h>
-  %include <ldns/rr.h>
 %include <ldns/str2host.h>
 %include <ldns/tsig.h>
   %include <ldns/update.h>