--- trunk/glib/gthread.h 2007/10/21 17:01:29 5792 +++ trunk/glib/gthread.h 2008/03/12 15:36:38 6691 @@ -140,9 +140,15 @@ /* internal function for fallback static mutex implementation */ GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex); +#ifdef __cplusplus #define g_static_mutex_get_mutex_impl_shortcut(mutex) \ (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \ g_static_mutex_get_mutex_impl (mutex)) +#else +#define g_static_mutex_get_mutex_impl_shortcut(mutex) \ + (g_atomic_pointer_get (mutex) ? *(mutex) : \ + g_static_mutex_get_mutex_impl (mutex)) +#endif /* shorthands for conditional and unconditional function calls */