glib r7111 - in branches/glib-2-16: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun 30 22:13:45 2008
New Revision: 7111
URL: http://svn.gnome.org/viewvc/glib?rev=7111&view=rev

Log:
        * glib/gslice.h (g_slice_copy): Apply type casts needed
        for proper compilation on 64-bit platforms.



Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/glib/gslice.h

Modified: branches/glib-2-16/glib/gslice.h
==============================================================================
--- branches/glib-2-16/glib/gslice.h	(original)
+++ branches/glib-2-16/glib/gslice.h	Mon Jun 30 22:13:45 2008
@@ -54,7 +54,8 @@
 
 /* we go through extra hoops to ensure type safety */
 #define g_slice_dup(type, mem)                                  \
-  (1 ? g_slice_copy (sizeof (type), (mem)) : (type*) ((type*) 0 == (mem)))
+  (1 ? (type*) g_slice_copy (sizeof (type), (mem)) 		\
+     : ((void) ((type*) 0 == (mem)), (type*) 0))
 #define g_slice_free(type, mem)				do {	\
   if (1) g_slice_free1 (sizeof (type), (mem));			\
   else   (void) ((type*) 0 == (mem)); 				\