summaryrefslogtreecommitdiff
path: root/gcache.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-12-16 05:38:35 +0000
committerTim Janik <timj@src.gnome.org>1998-12-16 05:38:35 +0000
commitb2e318ff3ecc50d72121a4e8561442a6d79a7a84 (patch)
tree87b800eae111a2ace0cde58292ae72fea3a8c19d /gcache.c
parent06600bd0e6b82639410394ed6b5ebb1189cfdeb3 (diff)
downloadglib-b2e318ff3ecc50d72121a4e8561442a6d79a7a84.tar.gz
version bump to 1.1.8, binary age 0, interface age 0.
Wed Dec 16 03:16:58 1998 Tim Janik <timj@gtk.org> * configure.in: version bump to 1.1.8, binary age 0, interface age 0. * glib.h: changed g_lock() to G_LOCK(), g_unlock() to G_UNLOCK() and g_trylock() to G_TRYLOCK(), since these are macros that expand to nothing with --disable-threads. changed G_LOCK_DEFINE() to G_LOCK_DECLARE() and introduced G_LOCK_DECLARE_STATIC() to achive the results of static G_LOCK_DECLARE(). changed semantics of g_thread_supported to g_thread_supported() so it can be used as a function like g_module_supported(). the actuall definition is still a macro that expands into a variable for performance reasons though. various indentation and coding style cleanups. * configure.in: added --enable-threads that defaults to yes. * gmutex.c: changed tests g_thread_supported to g_thread_supported (), changed variable settings of g_thread_supported to g_threads_got_initialized. garray.c: gcache.c: gdataset.c: gdate.c: ghash.c: glist.c: gmain.c: gnode.c: gslist.c: gstring.c: gtree.c: gutils.c: changed s/g_lock/G_LOCK/, s/g_unlock/G_UNLOCK/, s/static G_LOCK_DEFINE/G_LOCK_DECLARE_STATIC/.
Diffstat (limited to 'gcache.c')
-rw-r--r--gcache.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gcache.c b/gcache.c
index 800bb2b13..c9ed61f44 100644
--- a/gcache.c
+++ b/gcache.c
@@ -61,7 +61,7 @@ static void g_cache_node_destroy (GCacheNode *node);
static GMemChunk *node_mem_chunk = NULL;
-static G_LOCK_DEFINE(node_mem_chunk);
+G_LOCK_DECLARE_STATIC (node_mem_chunk);
GCache*
g_cache_new (GCacheNewFunc value_new_func,
@@ -198,13 +198,13 @@ g_cache_node_new (gpointer value)
{
GCacheNode *node;
- g_lock (node_mem_chunk);
+ G_LOCK (node_mem_chunk);
if (!node_mem_chunk)
node_mem_chunk = g_mem_chunk_new ("cache node mem chunk", sizeof (GCacheNode),
1024, G_ALLOC_AND_FREE);
node = g_chunk_new (GCacheNode, node_mem_chunk);
- g_unlock (node_mem_chunk);
+ G_UNLOCK (node_mem_chunk);
node->value = value;
node->ref_count = 1;
@@ -215,7 +215,7 @@ g_cache_node_new (gpointer value)
static void
g_cache_node_destroy (GCacheNode *node)
{
- g_lock (node_mem_chunk);
+ G_LOCK (node_mem_chunk);
g_mem_chunk_free (node_mem_chunk, node);
- g_unlock (node_mem_chunk);
+ G_UNLOCK (node_mem_chunk);
}