r4467: - tdb standalone build doesn't need -DSTANDALONE any more

- fixed standalone build
(This used to be commit ade0b71e4194f99d807d26276592bc041d46df7b)

diff --git a/source4/lib/tdb/Makefile.tdb b/source4/lib/tdb/Makefile.tdb
index a863b0de8b1f44a5a77dff564724d3f8a43d1a01..ee612bfb63d6b5d6a9a6b3499b9e46cfd5da2389 100644 (file)
--- a/source4/lib/tdb/Makefile.tdb
+++ b/source4/lib/tdb/Makefile.tdb
@@ -2,13 +2,13 @@
 # Makefile for tdb directory
 #
 
-CFLAGS = -DSTANDALONE -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
+CFLAGS = -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
 CC = gcc
 
 PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
 TDB_OBJ = common/tdb.o common/spinlock.o
 
-default: $(PROGS)
+all: $(PROGS)
 
 bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
        $(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm

diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index 890e25af50fc6c4d4ac22b894464b89886e069f0..bb2313369bcab015550f5538457ce2ece20cea8d 100644 (file)
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/source4/lib/tdb/tools/tdbtorture.c
@@ -219,7 +219,7 @@ static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf,
        if (getpid() == pids[0]) {
                for (i=0;i<NPROC-1;i++) {
                        int status;
-                       if (sys_waitpid(pids[i+1], &status, 0) != pids[i+1]) {
+                       if (waitpid(pids[i+1], &status, 0) != pids[i+1]) {
                                printf("failed to wait for %d\n",
                                       (int)pids[i+1]);
                                exit(1);