Fix for GStaticMutex deprecations in glib

This commit is contained in:
Stef Walter 2013-01-25 19:06:11 +01:00
parent 316df4e8ab
commit 3fcb3979d1
2 changed files with 5 additions and 5 deletions

View File

@ -60,8 +60,8 @@ AC_CHECK_FUNCS(mlock)
# GLib
PKG_CHECK_MODULES(GLIB,
glib-2.0 >= 2.31.0
gio-2.0 >= 2.31.0
glib-2.0 >= 2.32.0
gio-2.0 >= 2.32.0
gio-unix-2.0)
LIBS="$LIBS $GLIB_LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"

View File

@ -57,11 +57,11 @@ typedef struct {
lock, unlock, fallback, NULL, EGG_SECURE_POOL_VER_STR };
#define EGG_SECURE_DEFINE_GLIB_GLOBALS() \
static GStaticMutex memory_mutex = G_STATIC_MUTEX_INIT; \
static GMutex memory_mutex = { NULL, }; \
static void egg_memory_lock (void) \
{ g_static_mutex_lock (&memory_mutex); } \
{ g_mutex_lock (&memory_mutex); } \
static void egg_memory_unlock (void) \
{ g_static_mutex_unlock (&memory_mutex); } \
{ g_mutex_unlock (&memory_mutex); } \
EGG_SECURE_DEFINE_GLOBALS (egg_memory_lock, egg_memory_unlock, g_realloc);
extern egg_secure_glob EGG_SECURE_GLOBALS;