svn commit: samba r25893 - in branches/SAMBA_4_0/source/lib: ldb/ldb_tdb tdb/common tdb/tools

[jra at samba.org]

Author: jra
Date: 2007-11-07 07:13:44 +0000 (Wed, 07 Nov 2007)
New Revision: 25893

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

Log:
Fix ldb, tdb builds (and one warning).
Jeremy.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
   branches/SAMBA_4_0/source/lib/tdb/common/io.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h	2007-11-07 06:59:02 UTC (rev 25892)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h	2007-11-07 07:13:44 UTC (rev 25893)
@@ -1,6 +1,8 @@
 #if (_SAMBA_BUILD_ == 3)
 #include "tdb/include/tdb.h"
 #else
+#include "replace.h"
+#include "system/wait.h"
 #include "tdb.h"
 #endif
 

Modified: branches/SAMBA_4_0/source/lib/tdb/common/io.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/io.c	2007-11-07 06:59:02 UTC (rev 25892)
+++ branches/SAMBA_4_0/source/lib/tdb/common/io.c	2007-11-07 07:13:44 UTC (rev 25893)
@@ -96,7 +96,7 @@
 				 "%d of %d bytes at %d, trying once more\n",
 				 (int)written, len, off));
 			errno = ENOSPC;
-			written = pwrite(tdb->fd, (void *)((char *)buf+written),
+			written = pwrite(tdb->fd, (const void *)((const char *)buf+written),
 					 len-written,
 					 off+written);
 		}

Modified: branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c	2007-11-07 06:59:02 UTC (rev 25892)
+++ branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c	2007-11-07 07:13:44 UTC (rev 25893)
@@ -3,10 +3,10 @@
 */
 
 #include "replace.h"
-#include "tdb.h"
 #include "system/time.h"
 #include "system/wait.h"
 #include "system/filesys.h"
+#include "tdb.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>