diff options
Diffstat (limited to 'pythonmod/interface.i')
| -rw-r--r-- | pythonmod/interface.i | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pythonmod/interface.i b/pythonmod/interface.i index 89d138486606e..89dd73d996b58 100644 --- 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 { @@ -513,7 +513,7 @@ struct edns_option { } PyObject* _edns_option_opt_data_get(struct edns_option* option) { - return PyByteArray_FromStringAndSize((uint8_t*)option->opt_data, + return PyByteArray_FromStringAndSize((void*)option->opt_data, option->opt_len); } %} @@ -1332,7 +1332,7 @@ int edns_register_option(uint16_t opt_code, int bypass_cache_stage, SWIG_exception_fail(SWIG_TypeError, "Expected bytearray!"); return NULL; } - $2 = PyByteArray_AsString($input); + $2 = (void*)PyByteArray_AsString($input); $1 = PyByteArray_Size($input); } @@ -1353,8 +1353,8 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len, PyObject *result; int res = 0; - func = (PyObject *) python_callback; PyGILState_STATE gstate = PyGILState_Ensure(); + func = (PyObject *) python_callback; py_edns = SWIG_NewPointerObj((void*) edns, SWIGTYPE_p_edns_data, 0); py_qstate = SWIG_NewPointerObj((void*) qstate, SWIGTYPE_p_module_qstate, 0); @@ -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, |