From e4b22702b6fc72a6ac8989144ded3f78cb05d641 Mon Sep 17 00:00:00 2001
From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Sun, 12 Dec 2010 21:40:03 +0100
Subject: ldb:pyldb.h - revert to the previous header behaviour

"ldb_private.h" is private and therefore might not always be available.
---
 source4/lib/ldb-samba/pyldb.c | 4 +++-
 source4/lib/ldb/pyldb.c       | 2 ++
 source4/lib/ldb/pyldb.h       | 2 --
 source4/lib/ldb/pyldb_util.c  | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source4/lib')

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;
-- 
cgit