diff options
author | Stefano Karapetsas <[email protected]> | 2014-05-10 15:03:06 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2014-05-10 15:03:06 +0200 |
commit | 4796e9bf097fd481798d58092fe95951e99e79dd (patch) | |
tree | e22952f3e0fd1b06d9177de810eb3119cbe3e459 /eel/eel-string.c | |
parent | 30f835823d9f92d214f81225196fa7b0ea9e93e0 (diff) | |
parent | a2ab27abdf58a2910b1c24b2612cee0e1052418c (diff) | |
download | caja-4796e9bf097fd481798d58092fe95951e99e79dd.tar.bz2 caja-4796e9bf097fd481798d58092fe95951e99e79dd.tar.xz |
Merge pull request #275 from NiceandGently/master
fix some compile warnings
Diffstat (limited to 'eel/eel-string.c')
-rw-r--r-- | eel/eel-string.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/eel/eel-string.c b/eel/eel-string.c index fd733f88..3a8f2581 100644 --- a/eel/eel-string.c +++ b/eel/eel-string.c @@ -988,7 +988,11 @@ retry_atomic_decrement: { G_LOCK (unique_ref_strs); /* Need to recheck after taking lock to avoid races with _get_unique() */ +#if !GLIB_CHECK_VERSION (2, 30, 0) if (g_atomic_int_exchange_and_add (count, -1) == 0x80000001) +#else + if (g_atomic_int_add (count, -1) == 0x80000001) +#endif { g_hash_table_remove (unique_ref_strs, (char *)str); g_free ((char *)count); |