svn commit: samba r17885 - in branches/SAMBA_4_0/source/lib/talloc: .

metze at samba.org metze at samba.org
Mon Aug 28 15:36:12 GMT 2006


Author: metze
Date: 2006-08-28 15:36:12 +0000 (Mon, 28 Aug 2006)
New Revision: 17885

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

Log:
use _TALLOC_TYPEPF() consitently

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.h
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/talloc.h	2006-08-28 14:38:47 UTC (rev 17884)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.h	2006-08-28 15:36:12 UTC (rev 17885)
@@ -58,13 +58,12 @@
 #define _TALLOC_TYPEOF(ptr) __typeof__(ptr)
 #define talloc_set_destructor(ptr, function)				      \
 	do {								      \
-		int (*_talloc_destructor_fn)(typeof(ptr)) = (function);	      \
+		int (*_talloc_destructor_fn)(_TALLOC_TYPEOF(ptr)) = (function);	      \
 		_talloc_set_destructor((ptr), (void *)_talloc_destructor_fn); \
 	} while(0)
-#define _TALLOC_CHECK_TYPE(type,val) 
 /* this extremely strange macro is to avoid some braindamaged warning
    stupidity in gcc 4.1.x */
-#define talloc_steal(ctx, ptr) ({ __typeof__(ptr) __talloc_steal_ret = (__typeof__(ptr))_talloc_steal((ctx),(ptr)); __talloc_steal_ret; })
+#define talloc_steal(ctx, ptr) ({ _TALLOC_TYPEOF(ptr) __talloc_steal_ret = (_TALLOC_TYPEOF(ptr))_talloc_steal((ctx),(ptr)); __talloc_steal_ret; })
 #else
 #define talloc_set_destructor(ptr, function) \
 	_talloc_set_destructor((ptr), (int (*)(void *))(function))



More information about the samba-cvs mailing list