diff options
| author | Geert Hauwaerts <geert@hauwaerts.be> | 2015-09-23 20:11:47 +0200 |
|---|---|---|
| committer | Geert Hauwaerts <geert@hauwaerts.be> | 2015-09-23 20:11:47 +0200 |
| commit | 33e90c5ae3b91577c0caa6390c7f7fd6186768f1 (patch) | |
| tree | 6e817972c9a9d36b169e86f2bbd85252b3261aa9 /src | |
| parent | ce702884889165a775d66b0eb248009cd0ac75bb (diff) | |
| parent | 9da445ab86740be13f47da7eb540fb9e4b962085 (diff) | |
| download | irssi-33e90c5ae3b91577c0caa6390c7f7fd6186768f1.zip | |
Merge pull request #300 from dequis/drop-centos5
Drop centos 5 support, bump glib requirement to 2.16
Diffstat (limited to 'src')
| -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); |