Revert "Remove another use of global_loadparm."

[jra/samba/.git] / libcli / nbt / pynbt.c

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 9179245e88777bfaf3641fcf3227daa74159e4c6..9be6c79a8b23fe4784734037a45dd42fd1bcb512 100644 (file)
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -24,6 +24,10 @@
 #include "../libcli/nbt/libnbt.h"
 #include "lib/events/events.h"
 
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 PyAPI_DATA(PyTypeObject) nbt_node_Type;
 
 typedef struct {
@@ -40,7 +44,7 @@ static void py_nbt_node_dealloc(PyObject *obj)
 
 static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 {
-       struct event_context *ev;
+       struct tevent_context *ev;
        nbt_node_Object *ret = PyObject_New(nbt_node_Object, &nbt_node_Type);
 
        ret->mem_ctx = talloc_new(NULL);
@@ -89,7 +93,7 @@ static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, u
        return false;
 }
 
-static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *socket, struct nbt_name *name)
+static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socket, struct nbt_name *name)
 {
        if (PyTuple_Check(obj)) {
                if (PyTuple_Size(obj) == 2) {
@@ -120,7 +124,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *socket, st
        return false;
 }
 
-static PyObject *PyObject_FromNBTName(struct nbt_name_socket *socket, struct smb_iconv_convenience *ic,
+static PyObject *PyObject_FromNBTName(struct nbt_name_socket *name_socket, struct smb_iconv_convenience *ic,
                                      struct nbt_name *name)
 {
        if (name->scope) {
@@ -362,7 +366,7 @@ static PyObject *py_nbt_name_refresh(PyObject *self, PyObject *args, PyObject *k
 
 static PyObject *py_nbt_name_release(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       return Py_None; /* FIXME */
+       Py_RETURN_NONE; /* FIXME */
 }
 
 static PyMethodDef py_nbt_methods[] = {