[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
       via  4bc8b0c tdb2: use HAVE_LIBREPLACE instead of _SAMBA_BUILD_.
      from  c90870f s4:torture/smb2: fix compound.invalid2 against windows

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4bc8b0c19431072ae2b64a582fc70e491507ed1d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Tue Nov 1 07:11:25 2011 +1030

    tdb2: use HAVE_LIBREPLACE instead of _SAMBA_BUILD_.
    
    This is what lib/tdb2 really wants: to know if it should use normal
    headers or replace.h.  It currently uses _SAMBA_BUILD_, which is wrong
    for ldb, for example.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    
    Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date: Tue Nov  1 03:19:58 CET 2011 on sn-devel-104

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

Summary of changes:
 lib/tdb2/private.h |    2 +-
 lib/tdb2/tdb.c     |    2 +-
 lib/tdb2/tdb2.h    |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 93ceb5f..87245a5 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -22,7 +22,7 @@
 #include <ccan/likely/likely.h>
 #include <ccan/endian/endian.h>
 
-#ifdef _SAMBA_BUILD_
+#ifdef HAVE_LIBREPLACE
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/time.h"
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c
index 6f38244..5e965ac 100644
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -16,7 +16,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "private.h"
-#ifndef _SAMBA_BUILD_
+#ifndef HAVE_LIBREPLACE
 #include <ccan/asprintf/asprintf.h>
 #include <stdarg.h>
 #endif
diff --git a/lib/tdb2/tdb2.h b/lib/tdb2/tdb2.h
index 6a7cab6..55ad309 100644
--- a/lib/tdb2/tdb2.h
+++ b/lib/tdb2/tdb2.h
@@ -29,8 +29,10 @@
 extern "C" {
 #endif
 
-#ifndef _SAMBA_BUILD_
 #include "config.h"
+#ifdef HAVE_LIBREPLACE
+#include "replace.h"
+#else
 #if HAVE_FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
@@ -46,8 +48,6 @@ extern "C" {
 #include <stdbool.h>
 /* For memcmp */
 #include <string.h>
-#else
-#include "replace.h"
 #endif
 #include <ccan/compiler/compiler.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>


-- 
Samba Shared Repository