[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-264-g2fe137e
Stefan Metzmacher
metze at samba.org
Fri Jan 30 18:45:11 GMT 2009
The branch, master has been updated
via 2fe137e7bce425adf9cc64664eb493dfa8a7e885 (commit)
via d129507ee472b884d42d1bf301be6f235b0ac5a7 (commit)
via 84ca20a6b5e63f4bd73e2e2586d88ccb2adca123 (commit)
via 3718cf294ad1f3e00178cb34b2c914c9aecf2016 (commit)
via 2f8a39829611da0ba4661744ff189f66907b43e6 (commit)
via 55f663a04b791baf5a7a0bc635bd6f626498d8fc (commit)
via e8c2ed1d489ad67451459c69877ccba41b157e88 (commit)
from 9fa2e564886525dd82b3283da2c467bc8d576225 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2fe137e7bce425adf9cc64664eb493dfa8a7e885
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:44:20 2009 +0100
heimdal:hdb: always include "config.h" first
metze
commit d129507ee472b884d42d1bf301be6f235b0ac5a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:41:33 2009 +0100
s4:lib/ldb: include replace.h in pyldb.c
This fixes the build on Tru64.
metze
commit 84ca20a6b5e63f4bd73e2e2586d88ccb2adca123
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:39:34 2009 +0100
lib/tevent: include replace.h in pytevent.c
This fixes the build on Tru64.
metze
commit 3718cf294ad1f3e00178cb34b2c914c9aecf2016
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:38:59 2009 +0100
lib/tdb: include replace.h and system/filesys.h in pytdb.c
This fixes the build on Tru64.
metze
commit 2f8a39829611da0ba4661744ff189f66907b43e6
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:38:09 2009 +0100
lib/talloc: include replace.h in pytalloc.c
This fixes the build on Tru64.
metze
commit 55f663a04b791baf5a7a0bc635bd6f626498d8fc
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:37:06 2009 +0100
heimdal:camellia: include roken.h
metze
commit e8c2ed1d489ad67451459c69877ccba41b157e88
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 19:24:50 2009 +0100
Revert "s4:heimdal_build: include "system/network.h" via config.h wrapper"
This reverts commit 334c6e6b78de8529fce0061efd5249f8fe2d256f.
This breaks the build later in the ntvfs code...
metze
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/pytalloc.c | 1 +
lib/tdb/pytdb.c | 7 +++----
lib/tevent/pytevent.c | 1 +
source4/heimdal/lib/hcrypto/camellia-ntt.c | 2 ++
source4/heimdal/lib/hcrypto/camellia.c | 2 ++
source4/heimdal/lib/hdb/hdb.c | 4 ++++
source4/heimdal_build/config.h | 1 -
source4/lib/ldb/pyldb.c | 1 +
8 files changed, 14 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 51d087b..30da9ee 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -17,6 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "replace.h"
#include <talloc.h>
#include <pytalloc.h>
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 15a8d8a..60aae9f 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -24,6 +24,9 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "replace.h"
+#include "system/filesys.h"
+
#include <Python.h>
#ifndef Py_RETURN_NONE
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
@@ -34,11 +37,7 @@
#endif
/* Include tdb headers */
-#include <stdint.h>
-#include <signal.h>
#include <tdb.h>
-#include <fcntl.h>
-#include <stdbool.h>
typedef struct {
PyObject_HEAD
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 5d10554..5c34064 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -16,6 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "replace.h"
#include <Python.h>
#ifndef Py_RETURN_NONE
diff --git a/source4/heimdal/lib/hcrypto/camellia-ntt.c b/source4/heimdal/lib/hcrypto/camellia-ntt.c
index c6e3485..3582211 100644
--- a/source4/heimdal/lib/hcrypto/camellia-ntt.c
+++ b/source4/heimdal/lib/hcrypto/camellia-ntt.c
@@ -27,6 +27,8 @@
#include "config.h"
#endif
+#include <roken.h>
+
#include <string.h>
#include <stdlib.h>
diff --git a/source4/heimdal/lib/hcrypto/camellia.c b/source4/heimdal/lib/hcrypto/camellia.c
index 00635c9..d78bbd4 100644
--- a/source4/heimdal/lib/hcrypto/camellia.c
+++ b/source4/heimdal/lib/hcrypto/camellia.c
@@ -37,6 +37,8 @@
RCSID("$Id: aes.c 20466 2007-04-20 08:29:05Z lha $");
#endif
+#include <roken.h>
+
#ifdef KRB5
#include <krb5-types.h>
#endif
diff --git a/source4/heimdal/lib/hdb/hdb.c b/source4/heimdal/lib/hdb/hdb.c
index 15a1024..ad2c35a 100644
--- a/source4/heimdal/lib/hdb/hdb.c
+++ b/source4/heimdal/lib/hdb/hdb.c
@@ -31,6 +31,10 @@
* SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "krb5.h"
#include "krb5_locl.h"
#include "hdb_locl.h"
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 114e536..6a82637 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -8,7 +8,6 @@
#include "include/config.h"
#include "../replace/replace.h"
-#include "system/network.h"
#if !defined(HAVE_DIRFD) && !defined(HAVE_DIRFD_DECL) && !defined(dirfd)
#define dirfd(d) (-1)
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index f71ee23..ef2af06 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -25,6 +25,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "replace.h"
#include "ldb_private.h"
#include <Python.h>
#include "pyldb.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list