6 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/tdb/common/spinlock.c b/source4/lib/tdb/common/spinlock.c
index 27481e221c..30bfd77962 100644
--- a/source4/lib/tdb/common/spinlock.c
+++ b/source4/lib/tdb/common/spinlock.c
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#if STANDALONE
+#ifndef _SAMBA_BUILD_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -157,12 +157,12 @@ static inline int __spin_is_locked(spinlock_t *lock)
  * "sgi" and "_COMPILER_VERSION" are always defined by MIPSPro.
  */
 
-#if defined(STANDALONE)
+#ifndef _SAMBA_BUILD_
 
 /* MIPSPro 7.3 has "__inline" as an extension, but not "inline. */
 #define inline __inline
 
-#endif /* STANDALONE */
+#endif /* _SAMBA_BUILD_ */
 
 /* Returns 0 if the lock is acquired, EBUSY otherwise. */
 static inline int __spin_trylock(spinlock_t *lock)
diff --git a/source4/lib/tdb/common/tdb.c b/source4/lib/tdb/common/tdb.c
index afe2ca1621..46b2499179 100644
--- a/source4/lib/tdb/common/tdb.c
+++ b/source4/lib/tdb/common/tdb.c
@@ -46,7 +46,7 @@
  * right time.  Probably too hard -- the process just doesn't know.
  */ 
 
-#ifdef STANDALONE
+#ifndef _SAMBA_BUILD_
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source4/lib/tdb/tools/tdbbackup.c b/source4/lib/tdb/tools/tdbbackup.c
index 1a0e1c1588..4cb6a8cfdd 100644
--- a/source4/lib/tdb/tools/tdbbackup.c
+++ b/source4/lib/tdb/tools/tdbbackup.c
@@ -41,7 +41,7 @@
 
  */
 
-#ifdef STANDALONE
+#ifndef _SAMBA_BUILD_
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/source4/lib/tdb/tools/tdbdump.c b/source4/lib/tdb/tools/tdbdump.c
index dbb647cbbf..dd018af6f5 100644
--- a/source4/lib/tdb/tools/tdbdump.c
+++ b/source4/lib/tdb/tools/tdbdump.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef STANDALONE
+#ifndef _SAMBA_BUILD_
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/source4/lib/tdb/tools/tdbtest.c b/source4/lib/tdb/tools/tdbtest.c
index 6c20a5dc77..f4854b5931 100644
--- a/source4/lib/tdb/tools/tdbtest.c
+++ b/source4/lib/tdb/tools/tdbtest.c
@@ -1,6 +1,6 @@
 /* a test program for tdb - the trivial database */
 
-#ifdef STANDALONE
+#ifndef _SAMBA_BUILD_
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index e90a967138..890e25af50 100644
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/source4/lib/tdb/tools/tdbtorture.c
@@ -2,7 +2,7 @@
    writers - that stresses the locking code. Build with TDB_DEBUG=1
    for best effect */
 
-#ifdef STANDALONE
+#ifndef _SAMBA_BUILD_
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>