diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-01 05:08:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:07:54 -0500 |
| commit | 70067ef957d5ea10358ecec0ff7902e873a97521 (patch) | |
| tree | 7aaf63d2037bc2a31e54b9d64f46ae82164fcddd | |
| parent | f9e507980e6a3340ae135e81d3106a836116d6b0 (diff) | |
| download | samba-70067ef957d5ea10358ecec0ff7902e873a97521.tar.gz samba-70067ef957d5ea10358ecec0ff7902e873a97521.tar.bz2 samba-70067ef957d5ea10358ecec0ff7902e873a97521.zip | |
r4467: - tdb standalone build doesn't need -DSTANDALONE any more
- fixed standalone build
(This used to be commit ade0b71e4194f99d807d26276592bc041d46df7b)
| -rw-r--r-- | source4/lib/tdb/Makefile.tdb | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/tools/tdbtorture.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/tdb/Makefile.tdb b/source4/lib/tdb/Makefile.tdb index a863b0de8b..ee612bfb63 100644 --- 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 890e25af50..bb2313369b 100644 --- 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); |