luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-04 12:49:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply type casts needed for proper compilation on 64-bit platforms.

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


svn path=/branches/glib-2-16/; revision=7111
This commit is contained in:
Matthias Clasen
2008-06-30 22:13:45 +00:00
parent 041dd6b4ce
commit 1f2eb23cea
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:
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-06-20 Sebastian Dröge <slomo@circular-chaos.org> 2008-06-20 Sebastian Dröge <slomo@circular-chaos.org>
Bug 316221 - G_LOCK warns about breaking strict-aliasing rules Bug 316221 - G_LOCK warns about breaking strict-aliasing rules

3
glib/gslice.h
View File

@@ -54,7 +54,8 @@ void g_slice_free_chain_with_offset (gsize block_size,
/* we go through extra hoops to ensure type safety */ /* we go through extra hoops to ensure type safety */
#define g_slice_dup(type, mem) \ #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 { \ #define g_slice_free(type, mem) do { \
if (1) g_slice_free1 (sizeof (type), (mem)); \ if (1) g_slice_free1 (sizeof (type), (mem)); \
else (void) ((type*) 0 == (mem)); \ else (void) ((type*) 0 == (mem)); \