luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix uint/pointer casts

Browse Source
This commit is contained in:
Tim Janik 2005-12-02 15:28:56 +00:00
parent 1e01f52ed4
commit bbb77c8d21
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gslice.c
View File

@ -460,6 +460,7 @@ magazine_chain_prepare_fields (ChunkLink *magazine_chunks)
/* access the first 3 fields of a specially prepared magazine chain */ /* access the first 3 fields of a specially prepared magazine chain */
#define magazine_chain_prev(mc) ((mc)->data) #define magazine_chain_prev(mc) ((mc)->data)
#define magazine_chain_stamp(mc) ((mc)->next->data) #define magazine_chain_stamp(mc) ((mc)->next->data)
#define magazine_chain_uint_stamp(mc) GPOINTER_TO_UINT ((mc)->next->data)
#define magazine_chain_next(mc) ((mc)->next->next->data) #define magazine_chain_next(mc) ((mc)->next->next->data)
#define magazine_chain_count(mc) ((mc)->next->next->next->data) #define magazine_chain_count(mc) ((mc)->next->next->next->data)
@ -473,7 +474,7 @@ magazine_cache_trim (Allocator *allocator,
ChunkLink *current = magazine_chain_prev (allocator->magazines[ix]); ChunkLink *current = magazine_chain_prev (allocator->magazines[ix]);
ChunkLink *trash = NULL; ChunkLink *trash = NULL;
while (allocator->config.always_free || while (allocator->config.always_free ||
ABS (stamp - (guint) magazine_chain_stamp (current)) > allocator->config.working_set_msecs) ABS (stamp - magazine_chain_uint_stamp (current)) > allocator->config.working_set_msecs)
{ {
/* unlink */ /* unlink */
ChunkLink *prev = magazine_chain_prev (current); ChunkLink *prev = magazine_chain_prev (current);
@ -536,7 +537,7 @@ magazine_cache_push_magazine (guint ix,
magazine_chain_count (current) = (gpointer) count; magazine_chain_count (current) = (gpointer) count;
/* stamp magazine */ /* stamp magazine */
magazine_cache_update_stamp(); magazine_cache_update_stamp();
magazine_chain_stamp (current) = (gpointer) allocator->last_stamp; magazine_chain_stamp (current) = GUINT_TO_POINTER (allocator->last_stamp);
allocator->magazines[ix] = current; allocator->magazines[ix] = current;
/* free old magazines beyond a certain threshold */ /* free old magazines beyond a certain threshold */
magazine_cache_trim (allocator, ix, allocator->last_stamp); magazine_cache_trim (allocator, ix, allocator->last_stamp);