svn commit: samba r4467 - in branches/SAMBA_4_0/source/lib/tdb: . tools

[tridge at samba.org]

Author: tridge
Date: 2005-01-01 05:08:41 +0000 (Sat, 01 Jan 2005)
New Revision: 4467

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4467

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

- fixed standalone build



Modified:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb	2005-01-01 05:06:22 UTC (rev 4466)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb	2005-01-01 05:08:41 UTC (rev 4467)
@@ -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

Modified: branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c	2005-01-01 05:06:22 UTC (rev 4466)
+++ branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c	2005-01-01 05:08:41 UTC (rev 4467)
@@ -219,7 +219,7 @@
 	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);