From: Mathias Hasselmann <hasselmm@src.gnome.org>
Date: Thu, 10 Apr 2008 21:40:48 +0000 (+0000)
Subject: Bug 519137 – g_slice_dup macro needs cast for 64-bit platform
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=74487a8805ad9bbd9f38aaa64f43ed79b15c420f;p=dana%2Fcg-glib.git

Bug 519137 – g_slice_dup macro needs cast for 64-bit platform

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

svn path=/trunk/; revision=6848
---

diff --git a/ChangeLog b/ChangeLog
index 72ad4b38..243b0933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-10  Mathias Hasselmann  <mathias@openismus.com>
+
+	Bug 519137 – g_slice_dup macro needs cast for 64-bit platform
+
+	* glib/gslice.h (g_slice_copy): Apply type casts needed
+	  for proper compilation on 64-bit platforms.
+
 2008-04-09  Federico Mena Quintero  <federico@novell.com>
 
 	* glib/gbookmarkfile.c (bookmark_metadata_free): Don't leak
diff --git a/glib/gslice.h b/glib/gslice.h
index 835d1247..12f79762 100644
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -59,7 +59,8 @@ void     g_slice_free_chain_with_offset (gsize         block_size,
 
 /* 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)); 				\