diff options
author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-12 21:40:03 +0100 |
---|---|---|
committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-12 22:55:14 +0100 |
commit | e4b22702b6fc72a6ac8989144ded3f78cb05d641 (patch) | |
tree | ad82e6ef43bef1d73a9e3f1c00f7182d0933dc9d | |
parent | 35206df51af8288bedc3efb5e8bdd44feff42af6 (diff) | |
download | samba-e4b22702b6fc72a6ac8989144ded3f78cb05d641.tar.gz samba-e4b22702b6fc72a6ac8989144ded3f78cb05d641.tar.bz2 samba-e4b22702b6fc72a6ac8989144ded3f78cb05d641.zip |
ldb:pyldb.h - revert to the previous header behaviour
"ldb_private.h" is private and therefore might not always be available.
-rw-r--r-- | source4/dsdb/pydsdb.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb-samba/pyldb.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/pyldb.c | 2 | ||||
-rw-r--r-- | source4/lib/ldb/pyldb.h | 2 | ||||
-rw-r--r-- | source4/lib/ldb/pyldb_util.c | 2 | ||||
-rw-r--r-- | source4/libnet/py_net.c | 4 | ||||
-rw-r--r-- | source4/param/provision.c | 4 |
7 files changed, 16 insertions, 6 deletions
diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index 64b7266e72..f304153604 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -17,8 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/ldb/pyldb.h" +#include <Python.h> #include "includes.h" +#include <ldb.h> +#include <pyldb.h> #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" #include "librpc/ndr/libndr.h" diff --git a/source4/lib/ldb-samba/pyldb.c b/source4/lib/ldb-samba/pyldb.c index f198d74b51..9345145af1 100644 --- a/source4/lib/ldb-samba/pyldb.c +++ b/source4/lib/ldb-samba/pyldb.c @@ -19,8 +19,10 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "lib/ldb/pyldb.h" +#include <Python.h> #include "includes.h" +#include <ldb.h> +#include <pyldb.h> #include "param/pyparam.h" #include "auth/credentials/pycredentials.h" #include "ldb_wrap.h" diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index 44a006ffb3..0167c570c5 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -26,6 +26,8 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include <Python.h> +#include "ldb_private.h" #include "pyldb.h" /* There's no Py_ssize_t in 2.4, apparently */ diff --git a/source4/lib/ldb/pyldb.h b/source4/lib/ldb/pyldb.h index afc8c51881..211789c18b 100644 --- a/source4/lib/ldb/pyldb.h +++ b/source4/lib/ldb/pyldb.h @@ -26,9 +26,7 @@ #ifndef _PYLDB_H_ #define _PYLDB_H_ -#include <Python.h> #include <talloc.h> -#include "ldb_private.h" typedef struct { PyObject_HEAD diff --git a/source4/lib/ldb/pyldb_util.c b/source4/lib/ldb/pyldb_util.c index 35071f3645..79077416be 100644 --- a/source4/lib/ldb/pyldb_util.c +++ b/source4/lib/ldb/pyldb_util.c @@ -23,6 +23,8 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include <Python.h> +#include "ldb.h" #include "pyldb.h" static PyObject *ldb_module = NULL; diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c index 28dee5935d..48cf4a416d 100644 --- a/source4/libnet/py_net.c +++ b/source4/libnet/py_net.c @@ -18,8 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/ldb/pyldb.h" +#include <Python.h> #include "includes.h" +#include <ldb.h> +#include <pyldb.h> #include "libnet.h" #include "auth/credentials/pycredentials.h" #include "libcli/security/security.h" diff --git a/source4/param/provision.c b/source4/param/provision.c index 790cf83783..f1ef695ac0 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -18,7 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/ldb/pyldb.h" +#include <Python.h> +#include <ldb.h> +#include <pyldb.h> #include "includes.h" #include "librpc/ndr/libndr.h" #include "param/provision.h" |