- Fix pythonmod for typedef changes.

git-svn-id: file:///svn/unbound/trunk@4005 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-02-10 07:58:38 +00:00
parent d3edcc3fab
commit e338cb00f3
2 changed files with 13 additions and 10 deletions

View file

@ -1,3 +1,6 @@
10 February 2017: Wouter
- Fix pythonmod for typedef changes.
9 February 2017: Wouter 9 February 2017: Wouter
- tag 1.6.1rc1. - tag 1.6.1rc1.

View file

@ -245,23 +245,23 @@ uint16_t ntohs(uint16_t netshort);
} }
#if defined(SWIGWORDSIZE64) #if defined(SWIGWORDSIZE64)
typedef long int rrset_id_t; typedef long int rrset_id_type;
#else #else
typedef long long int rrset_id_t; typedef long long int rrset_id_type;
#endif #endif
struct ub_packed_rrset_key { struct ub_packed_rrset_key {
struct lruhash_entry entry; struct lruhash_entry entry;
rrset_id_t id; rrset_id_type id;
struct packed_rrset_key rk; struct packed_rrset_key rk;
}; };
struct lruhash_entry { struct lruhash_entry {
lock_rw_t lock; lock_rw_type lock;
struct lruhash_entry* overflow_next; struct lruhash_entry* overflow_next;
struct lruhash_entry* lru_next; struct lruhash_entry* lru_next;
struct lruhash_entry* lru_prev; struct lruhash_entry* lru_prev;
hashvalue_t hash; hashvalue_type hash;
void* key; void* key;
struct packed_rrset_data* data; struct packed_rrset_data* data;
}; };
@ -376,7 +376,7 @@ struct reply_info {
struct rrset_ref { struct rrset_ref {
struct ub_packed_rrset_key* key; struct ub_packed_rrset_key* key;
rrset_id_t id; rrset_id_type id;
}; };
struct dns_msg { struct dns_msg {
@ -1415,13 +1415,13 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
%} %}
/* C declarations */ /* C declarations */
int inplace_cb_reply_register( 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( 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( 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( 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 */ /* Swig declarations */
static int register_inplace_cb_reply(PyObject* py_cb, static int register_inplace_cb_reply(PyObject* py_cb,