[SCM] Samba Shared Repository - branch master updated - ef1e9ed94176d4ed938b184f8837e527dbf2c80c

[Kai Blin]

The branch, master has been updated
       via  ef1e9ed94176d4ed938b184f8837e527dbf2c80c (commit)
       via  daaa2c8231574d1879a492d1002f4f4dcff764b8 (commit)
      from  5184baa9591640c7fac4574bad6c15f5c7302a87 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ef1e9ed94176d4ed938b184f8837e527dbf2c80c
Author: Kai Blin <kai at samba.org>
Date:   Fri Dec 26 14:09:02 2008 +0100

    Fix some tevent includes, trying to fix the build

commit daaa2c8231574d1879a492d1002f4f4dcff764b8
Author: Kai Blin <kai at samba.org>
Date:   Fri Dec 26 13:32:26 2008 +0100

    Try to fix the build by fixing some typos in the vfs code

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_default.c          |    6 +++---
 source4/lib/events/events_internal.h   |    2 +-
 source4/lib/events/tevent_s4.c         |    4 ++--
 source4/lib/ldb/include/ldb_includes.h |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index d7f3922..cfd3b1e 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -745,10 +745,10 @@ static int strict_allocate_ftruncate(vfs_handle_struct *handle, files_struct *fs
 		uint64_t space_avail;
 		uint64_t bsize,dfree,dsize;
 
-		space_avail = get_dfree_info(conn,fsp->fsp_name,false,&bsize,&dfree,&dsize);
+		space_avail = get_dfree_info(fsp->conn,fsp->fsp_name,false,&bsize,&dfree,&dsize);
 		/* space_avail is 1k blocks */
-		if (space_avail == (SMB_BIG_UINT)-1 ||
-				((SMB_BIG_UINT)space_to_write/1024 > space_avail) ) {
+		if (space_avail == (uint64_t)-1 ||
+				((uint64_t)space_to_write/1024 > space_avail) ) {
 			errno = ENOSPC;
 			return -1;
 		}
diff --git a/source4/lib/events/events_internal.h b/source4/lib/events/events_internal.h
index 308587c..e092831 100644
--- a/source4/lib/events/events_internal.h
+++ b/source4/lib/events/events_internal.h
@@ -1 +1 @@
-#include <tevent_internal.h>
+#include <../lib/tevent/tevent_internal.h>
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c
index e711e43..22e0525 100644
--- a/source4/lib/events/tevent_s4.c
+++ b/source4/lib/events/tevent_s4.c
@@ -17,8 +17,8 @@
 */
 
 #include "includes.h"
-#include <tevent.h>
-#include <tevent_internal.h>
+#include <events.h>
+#include <events_internal.h>
 
 /*
   this is used to catch debug messages from events
diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h
index b55350a..29c7b2d 100644
--- a/source4/lib/ldb/include/ldb_includes.h
+++ b/source4/lib/ldb/include/ldb_includes.h
@@ -20,7 +20,7 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "talloc.h"
-#include "tevent.h"
+#include "events.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"


-- 
Samba Shared Repository