[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  76a8ae9 pytalloc: Fix warning that we are subtracting void* pointers
      from  615482a s3: Hang the isilon kernel oplocks off the NULL context

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


- Log -----------------------------------------------------------------
commit 76a8ae9e0db0340bfa96c428d55afe9b885977e0
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Oct 8 04:19:30 2010 +0300

    pytalloc: Fix warning that we are subtracting void* pointers
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Fri Oct  8 23:36:54 UTC 2010 on sn-devel-104

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

Summary of changes:
 lib/talloc/pytalloc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index bea6961..b0b7394 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -109,7 +109,7 @@ int py_talloc_default_cmp(PyObject *_obj1, PyObject *_obj2)
 	if (obj1->ob_type != obj2->ob_type)
 		return (obj1->ob_type - obj2->ob_type);
 
-	return (py_talloc_get_ptr(obj1) - py_talloc_get_ptr(obj2));
+	return ((char *)py_talloc_get_ptr(obj1) - (char *)py_talloc_get_ptr(obj2));
 }
 
 static void py_cobject_talloc_free(void *ptr)


-- 
Samba Shared Repository