diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-01-16 23:03:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-01-16 23:03:10 +0000 |
| commit | 488cee497742bc04861250cb42a94c2678c771b7 (patch) | |
| tree | 7f63bc115f2e581be8567ad2e6814dd840fcfe53 | |
| parent | 5fb7be39616e1553cfe0b9a911ce59b569aa27c4 (diff) | |
| download | glib-488cee497742bc04861250cb42a94c2678c771b7.tar.gz | |
Rework the strict aliasing fix to not break C++, pointed out by Murray
2006-01-16 Matthias Clasen <mclasen@redhat.com>
* glib/gthread.h (g_static_mutex_get_mutex_impl_shortcut):
Rework the strict aliasing fix to not break C++, pointed
out by Murray Cumming.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 4 | ||||
| -rw-r--r-- | glib/gthread.h | 2 |
4 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,9 @@ 2006-01-16 Matthias Clasen <mclasen@redhat.com> + * glib/gthread.h (g_static_mutex_get_mutex_impl_shortcut): + Rework the strict aliasing fix to not break C++, pointed + out by Murray Cumming. + * glib/gasyncqueue.c (g_async_queue_push_sorted_unlocked): Signal waiting threads, problem noticed by Christian Kellner. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 99ee1db5c..b9c01356f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-01-16 Matthias Clasen <mclasen@redhat.com> + * glib/gthread.h (g_static_mutex_get_mutex_impl_shortcut): + Rework the strict aliasing fix to not break C++, pointed + out by Murray Cumming. + * glib/gasyncqueue.c (g_async_queue_push_sorted_unlocked): Signal waiting threads, problem noticed by Christian Kellner. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 99ee1db5c..b9c01356f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,9 @@ 2006-01-16 Matthias Clasen <mclasen@redhat.com> + * glib/gthread.h (g_static_mutex_get_mutex_impl_shortcut): + Rework the strict aliasing fix to not break C++, pointed + out by Murray Cumming. + * glib/gasyncqueue.c (g_async_queue_push_sorted_unlocked): Signal waiting threads, problem noticed by Christian Kellner. diff --git a/glib/gthread.h b/glib/gthread.h index 2d0170e1b..2ae313f4f 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -138,7 +138,7 @@ void g_thread_init_with_errorcheck_mutexes (GThreadFunctions* vtable); GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex); #define g_static_mutex_get_mutex_impl_shortcut(mutex) \ - (g_atomic_pointer_get (mutex) ? *(mutex) : \ + (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \ g_static_mutex_get_mutex_impl (mutex)) /* shorthands for conditional and unconditional function calls */ |