[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2609-ga475dee

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  a475dee8036156d4c8330bae97208ec546342f42 (commit)
      from  f62909d2b457f3494c9536c994a9209f8cc0c331 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit a475dee8036156d4c8330bae97208ec546342f42
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 09:50:34 2008 +0200

    Fix the build on FreeBSD 4.6.2

-----------------------------------------------------------------------

Summary of changes:
 source/lib/dbwrap_rbt.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_rbt.c b/source/lib/dbwrap_rbt.c
index 46459c8..b70ce3d 100644
--- a/source/lib/dbwrap_rbt.c
+++ b/source/lib/dbwrap_rbt.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "rbtree.h"
 
-#define ALIGN(_size_) (((_size_)+15)&~15)
+#define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
 
 struct db_rbt_ctx {
 	struct rb_root tree;
@@ -42,7 +42,7 @@ struct db_rbt_node {
 	 * target for offsetof()
 	 */
 
-	char data[];
+	char data[1];
 };
 
 /*
@@ -243,7 +243,8 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx,
 	 * off.
 	 */
 
-	size = ALIGN(sizeof(struct db_record)) + sizeof(struct db_rbt_rec);
+	size = DBWRAP_RBT_ALIGN(sizeof(struct db_record))
+		+ sizeof(struct db_rbt_rec);
 
 	if (!found) {
 		/*
@@ -258,7 +259,7 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx,
 	}
 
 	rec_priv = (struct db_rbt_rec *)
-		((char *)result + ALIGN(sizeof(struct db_record)));
+		((char *)result + DBWRAP_RBT_ALIGN(sizeof(struct db_record)));
 	rec_priv->db_ctx = ctx;
 
 	result->store = db_rbt_store;


-- 
Samba Shared Repository