diff options
| author | dequis <dx@dxzone.com.ar> | 2015-09-23 13:42:00 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2015-09-23 13:58:22 -0300 |
| commit | 9da445ab86740be13f47da7eb540fb9e4b962085 (patch) | |
| tree | 6e817972c9a9d36b169e86f2bbd85252b3261aa9 | |
| parent | e833521cefdedcdbc0e4382715a36ea5f8276a86 (diff) | |
| download | irssi-9da445ab86740be13f47da7eb540fb9e4b962085.zip | |
Drop some glib version checks that are not needed anymore
The g_strcmp0 fallback in particular was broken since it was used in a
few places as a GCompareFunc, and macros don't work that way.
Yes, that one was my fault, but nobody complained :D
| -rw-r--r-- | src/common.h | 13 | ||||
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 11 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/common.h b/src/common.h index e9073925..86a079fe 100644 --- a/src/common.h +++ b/src/common.h @@ -43,19 +43,6 @@ # include <gmodule.h> #endif -#if !GLIB_CHECK_VERSION(2,10,0) -#define g_slice_alloc(size) g_malloc(size) -#define g_slice_alloc0(size) g_malloc0(size) -#define g_slice_free1(size, mem) g_free(mem) -#define g_slice_new(type) g_new(type, 1) -#define g_slice_new0(type) g_new0(type, 1) -#define g_slice_free(type, mem) g_free(mem) -#endif - -#if !GLIB_CHECK_VERSION(2,16,0) -#define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b))) -#endif - #if defined (UOFF_T_INT) typedef unsigned int uoff_t; #elif defined (UOFF_T_LONG) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 341902df..a15850e2 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -450,18 +450,7 @@ void fe_common_core_finish_init(void) signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed); /* _after_ windows are created.. */ -#if GLIB_CHECK_VERSION(2,6,0) g_log_set_default_handler((GLogFunc) glog_func, NULL); -#else - g_log_set_handler(G_LOG_DOMAIN, - (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | - G_LOG_LEVEL_WARNING), - (GLogFunc) glog_func, NULL); - g_log_set_handler("GLib", - (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | - G_LOG_LEVEL_WARNING), - (GLogFunc) glog_func, NULL); /* send glib errors to the same place */ -#endif if (setup_changed) signal_emit("setup changed", 0); |