summaryrefslogtreecommitdiff
path: root/gstring.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 /gstring.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 'gstring.c')
-rw-r--r--gstring.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gstring.c b/gstring.c
index 312a54060..a2718c695 100644
--- a/gstring.c
+++ b/gstring.c
@@ -48,7 +48,7 @@ struct _GRealString
gint alloc;
};
-static G_LOCK_DEFINE(string_mem_chunk);
+G_LOCK_DECLARE_STATIC (string_mem_chunk);
static GMemChunk *string_mem_chunk = NULL;
/* Hash Functions.
@@ -207,14 +207,14 @@ g_string_sized_new (guint dfl_size)
{
GRealString *string;
- g_lock (string_mem_chunk);
+ G_LOCK (string_mem_chunk);
if (!string_mem_chunk)
string_mem_chunk = g_mem_chunk_new ("string mem chunk",
sizeof (GRealString),
1024, G_ALLOC_AND_FREE);
string = g_chunk_new (GRealString, string_mem_chunk);
- g_unlock (string_mem_chunk);
+ G_UNLOCK (string_mem_chunk);
string->alloc = 0;
string->len = 0;
@@ -248,9 +248,9 @@ g_string_free (GString *string,
if (free_segment)
g_free (string->str);
- g_lock (string_mem_chunk);
+ G_LOCK (string_mem_chunk);
g_mem_chunk_free (string_mem_chunk, string);
- g_unlock (string_mem_chunk);
+ G_UNLOCK (string_mem_chunk);
}
GString*