diff options
| author | Monsta <[email protected]> | 2015-01-12 16:04:13 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-01-13 11:55:00 +0100 |
| commit | 53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8 (patch) | |
| tree | bc422498f805a6ae0b5495157a7482616ec16259 /eel | |
| parent | d327a96cfb61acd0ce606c4bf80349454b66bd44 (diff) | |
| download | caja-53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8.tar.bz2 caja-53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8.tar.xz | |
drop support for GLib < 2.36
Closes https://github.com/mate-desktop/caja/pull/372
Diffstat (limited to 'eel')
| -rw-r--r-- | eel/eel-glib-extensions.c | 2 | ||||
| -rw-r--r-- | eel/eel-string.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c index 96eeb354..68ed9e86 100644 --- a/eel/eel-glib-extensions.c +++ b/eel/eel-glib-extensions.c @@ -38,8 +38,6 @@ #include <time.h> #include <locale.h> -#include <src/glibcompat.h> /* for g_list_free_full */ - /* Legal conversion specifiers, as specified in the C standard. */ #define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ" #define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY" diff --git a/eel/eel-string.c b/eel/eel-string.c index 3a8f2581..5d74c317 100644 --- a/eel/eel-string.c +++ b/eel/eel-string.c @@ -988,11 +988,7 @@ 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); |