pytevent: Fix include path - tevent_util is not installed.

[ira/wip.git] / lib / tevent / pytevent.c

diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 3d71d78397414394b92bb9e675aa54c2445c1fb5..3b45ba192875d6c994fd108e35788e21d84af1da 100644 (file)
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -1,25 +1,35 @@
 /* 
    Unix SMB/CIFS implementation.
    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
+
+     ** NOTE! The following LGPL license applies to the tevent
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "replace.h"
 #include <Python.h>
+
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #include <tevent.h>
 #include <stdbool.h>
-#include <tevent_util.h>
+#include "tevent_util.h"
 
 typedef struct {
        PyObject_HEAD
@@ -35,7 +45,7 @@ static PyObject *py_set_default_backend(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "s", &name))
         return NULL;
     tevent_set_default_backend(name);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *py_backend_list(PyObject *self)
@@ -67,7 +77,9 @@ static PyObject *py_event_ctx_new(PyTypeObject *type, PyObject *args, PyObject *
     char *name = NULL;
     struct tevent_context *ev_ctx;
     PyTEventContextObject *ret;
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", (char **)kwnames, &name))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s",
+                                    discard_const_p(char *, kwnames),
+                                    &name))
         return NULL;
 
     if (name == NULL)