mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Merge pull request #300 from dequis/drop-centos5
Drop centos 5 support, bump glib requirement to 2.16
This commit is contained in:
commit
33e90c5ae3
@ -261,7 +261,7 @@ for try in 1 2; do
|
||||
echo "*** trying without -lgmodule"
|
||||
glib_modules=
|
||||
fi
|
||||
AM_PATH_GLIB_2_0(2.6.0,,, $glib_modules)
|
||||
AM_PATH_GLIB_2_0(2.16.0,,, $glib_modules)
|
||||
if test "$GLIB_LIBS"; then
|
||||
if test $glib_modules = gmodule; then
|
||||
AC_DEFINE(HAVE_GMODULE)
|
||||
|
@ -1,5 +1,3 @@
|
||||
docdir = $(datadir)/doc/irssi
|
||||
|
||||
man_MANS = \
|
||||
irssi.1
|
||||
|
||||
|
13
src/common.h
13
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)
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user