diff options
| author | Tim Janik <timj@gtk.org> | 1998-12-16 06:03:14 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-12-16 06:03:14 +0000 |
| commit | 017dfc9e4ee30ef271b5392a5f45d37ab0ad2e87 (patch) | |
| tree | 92e3c52ac9d7e59bbeaf8687d2d2c37c1eaba2c6 /gtk/gtkprivate.h | |
| parent | 2c9c7efb2349e145f9af38677d54c4d818c069b0 (diff) | |
| download | gtk+-017dfc9e4ee30ef271b5392a5f45d37ab0ad2e87.tar.gz | |
version bump to 1.1.8, binary age 0, interface age 0, depend on GLib
Wed Dec 16 05:26:32 1998 Tim Janik <timj@gtk.org>
* configure.in: version bump to 1.1.8, binary age 0, interface age 0,
depend on GLib 1.1.8.
* gdk/gdkprivate.h:
* gdk/gdkglobals.c: removed last Gdk threads specific bits.
* gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
* gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
and GTK_THREADS_LEAVE(). changed callers accordingly.
Diffstat (limited to 'gtk/gtkprivate.h')
| -rw-r--r-- | gtk/gtkprivate.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 17a7b3f872..9c22b1019e 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -64,14 +64,20 @@ typedef enum extern GMutex *gtk_threads_mutex; -#define GTK_THREADS_ENTER G_STMT_START { \ - if (gtk_threads_mutex) \ - g_mutex_lock (gtk_threads_mutex); \ - } G_STMT_END -#define GTK_THREADS_LEAVE G_STMT_START { \ - if (gtk_threads_mutex) \ - g_mutex_unlock (gtk_threads_mutex); \ - } G_STMT_END +#ifdef G_THREADS_ENABLED +# define GTK_THREADS_ENTER() G_STMT_START { \ + if (gtk_threads_mutex) \ + g_mutex_lock (gtk_threads_mutex); \ + } G_STMT_END +# define GTK_THREADS_LEAVE() G_STMT_START { \ + if (gtk_threads_mutex) \ + g_mutex_unlock (gtk_threads_mutex); \ + } G_STMT_END +#else /* !G_THREADS_ENABLED */ +# define GTK_THREADS_ENTER() +# define GTK_THREADS_LEAVE() +#endif /* !G_THREADS_ENABLED */ + #ifdef __cplusplus } |