- Fix pythonmod for typedef changes.

git-svn-id: file:///svn/unbound/trunk@4005 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 8757a9934aba8fe9690ee76295c1e45a6aa404ca..1e030882c14c5b53b711cf85bf67abaaacc69a8d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+10 February 2017: Wouter
+       - Fix pythonmod for typedef changes.
+
 9 February 2017: Wouter
        - tag 1.6.1rc1.
 

diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 89d138486606e1691c3d036e9bbbe1ce2f3ad115..01f617f7a629757d77d5d5573871219c8e762d5e 100644 (file)
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -245,23 +245,23 @@ uint16_t ntohs(uint16_t netshort);
 }
 
 #if defined(SWIGWORDSIZE64) 
-typedef long int                rrset_id_t;
+typedef long int                rrset_id_type;
 #else 
-typedef long long int           rrset_id_t;
+typedef long long int           rrset_id_type;
 #endif 
 
 struct ub_packed_rrset_key {
    struct lruhash_entry entry;
-   rrset_id_t id;
+   rrset_id_type id;
    struct packed_rrset_key rk;
 };
 
 struct lruhash_entry {
-  lock_rw_t lock;
+  lock_rw_type lock;
   struct lruhash_entry* overflow_next;
   struct lruhash_entry* lru_next;
   struct lruhash_entry* lru_prev;
-  hashvalue_t hash;
+  hashvalue_type hash;
   void* key;
   struct packed_rrset_data* data;
 };
@@ -376,7 +376,7 @@ struct reply_info {
 
 struct rrset_ref {
    struct ub_packed_rrset_key* key;
-   rrset_id_t id;
+   rrset_id_type id;
 };
 
 struct dns_msg {
@@ -1415,13 +1415,13 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
 %}
 /* C declarations */
 int inplace_cb_reply_register(
-    inplace_cb_reply_func_t* cb, void* cb_arg, struct module_env* env);
+    inplace_cb_reply_func_type* cb, void* cb_arg, struct module_env* env);
 int inplace_cb_reply_cache_register(
-    inplace_cb_reply_func_t* cb, void* cb_arg, struct module_env* env);
+    inplace_cb_reply_func_type* cb, void* cb_arg, struct module_env* env);
 int inplace_cb_reply_local_register(
-    inplace_cb_reply_func_t* cb, void* cb_arg, struct module_env* env);
+    inplace_cb_reply_func_type* cb, void* cb_arg, struct module_env* env);
 int inplace_cb_reply_servfail_register(
-    inplace_cb_reply_func_t* cb, void* cb_arg, struct module_env* env);
+    inplace_cb_reply_func_type* cb, void* cb_arg, struct module_env* env);
 
 /* Swig declarations */
 static int register_inplace_cb_reply(PyObject* py_cb,