The branch, master has been updated via d61ba23 Use uintptr_t for pointer int cast in SMBC_getdents_ctx() from 64a88f7 dbwrap_rbt: Make "key" and "value" aligned to 16 byte
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d61ba23c36d5127dfdf9c10ac8bc1a0429ed9e30 Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Date: Wed Jul 1 10:41:34 2015 +1200 Use uintptr_t for pointer int cast in SMBC_getdents_ctx() On i386, unsigned long long is 64 bit while the pointer is 32, and this fails under autobuild with -WError. Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Jul 21 05:14:20 CEST 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/libsmb/libsmb_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 636e0cc..97ecaa4 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -1129,7 +1129,7 @@ SMBC_getdents_ctx(SMBCCTX *context, /* Try and align the struct for the next entry on a valid pointer boundary by appending zeros */ - while((rem > 0) && ((unsigned long long)ndir & (sizeof(void*) - 1))) { + while((rem > 0) && ((uintptr_t)ndir & (sizeof(void*) - 1))) { *ndir = '\0'; rem--; ndir++; -- Samba Shared Repository