[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Apr 14 04:57:02 MDT 2011
The branch, master has been updated
via 7ece43b s3-build: make sure we pick up system tdb and talloc via #include.
via daea6a4 s3-includes: move readahead prototype to its only user.
from 15d6c70 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7ece43b15e11ccff6181266d53c88c14271167c2
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 14 11:43:31 2011 +0200
s3-build: make sure we pick up system tdb and talloc via #include.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Apr 14 12:56:28 CEST 2011 on sn-devel-104
commit daea6a4b8cf48c96718d6f757d01c430d1811446
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 14 00:52:45 2011 +0200
s3-includes: move readahead prototype to its only user.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 2 +-
source3/include/includes.h | 8 ++------
source3/include/util_tdb.h | 4 ++--
source3/lib/tdb_validate.h | 2 +-
source3/modules/vfs_readahead.c | 4 ++++
5 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index f0d54cc..086e044 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2151,7 +2151,7 @@ then
AC_SUBST(TDBTORTURE)
ac_cv_have_tdb_err_nesting=yes
else
- AC_TRY_COMPILE([#include "tdb.h"],
+ AC_TRY_COMPILE([#include <tdb.h>],
[enum TDB_ERROR err = TDB_ERR_NESTING],
ac_cv_have_tdb_err_nesting=yes,
ac_cv_have_tdb_err_nesting=no)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5d6e554..1dac73a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -515,10 +515,10 @@ typedef char fstring[FSTRING_LEN];
#include "../lib/util/attr.h"
#include "../lib/util/tsort.h"
#include "../lib/util/dlinklist.h"
-#include "tdb.h"
+#include <tdb.h>
#include "util_tdb.h"
-#include "talloc.h"
+#include <talloc.h>
#include "event.h"
#include "../lib/util/tevent_unix.h"
@@ -672,10 +672,6 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
#endif
-#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
-ssize_t readahead(int fd, off64_t offset, size_t count);
-#endif
-
#ifdef TRUE
#undef TRUE
#endif
diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 9666fc9..3bdb697 100644
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -20,9 +20,9 @@
#ifndef __TDBUTIL_H__
#define __TDBUTIL_H__
-#include "tdb.h"
+#include <tdb.h>
-#include "talloc.h" /* for tdb_wrap_open() */
+#include <talloc.h> /* for tdb_wrap_open() */
#include "../libcli/util/ntstatus.h" /* for map_nt_error_from_tdb() */
#include "../../lib/util/util_tdb.h"
diff --git a/source3/lib/tdb_validate.h b/source3/lib/tdb_validate.h
index 9eda79d..3e7c20d 100644
--- a/source3/lib/tdb_validate.h
+++ b/source3/lib/tdb_validate.h
@@ -23,7 +23,7 @@
#define __TDB_VALIDATE_H__
#include "lib/replace/replace.h"
-#include "tdb.h"
+#include <tdb.h>
/**
* Flag field for keeping track of the status of a validation.
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c
index b9dbece..22f7f70 100644
--- a/source3/modules/vfs_readahead.c
+++ b/source3/modules/vfs_readahead.c
@@ -19,6 +19,10 @@
#include "system/filesys.h"
#include "smbd/smbd.h"
+#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
+ssize_t readahead(int fd, off64_t offset, size_t count);
+#endif
+
struct readahead_data {
SMB_OFF_T off_bound;
SMB_OFF_T len;
--
Samba Shared Repository
More information about the samba-cvs
mailing list