diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-11-01 07:11:25 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-11-01 03:19:58 +0100 |
| commit | 4bc8b0c19431072ae2b64a582fc70e491507ed1d (patch) | |
| tree | 509090952a5a8ee175f65e430734ece3005d761b | |
| parent | c90870f9b728dfb827ebc2fe8ad67a7ca3a50c43 (diff) | |
| download | samba-4bc8b0c19431072ae2b64a582fc70e491507ed1d.tar.gz samba-4bc8b0c19431072ae2b64a582fc70e491507ed1d.tar.bz2 samba-4bc8b0c19431072ae2b64a582fc70e491507ed1d.zip | |
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@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue Nov 1 03:19:58 CET 2011 on sn-devel-104
| -rw-r--r-- | lib/tdb2/private.h | 2 | ||||
| -rw-r--r-- | lib/tdb2/tdb.c | 2 | ||||
| -rw-r--r-- | lib/tdb2/tdb2.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h index 93ceb5f4ec..87245a5970 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 6f38244352..5e965acabd 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 6a7cab617d..55ad309722 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> |