jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #300 from dequis/drop-centos5

Browse Source 
Drop centos 5 support, bump glib requirement to 2.16
This commit is contained in:
Geert Hauwaerts 2015-09-23 20:11:47 +02:00
commit 33e90c5ae3
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -261,7 +261,7 @@ for try in 1 2; do
echo "*** trying without -lgmodule" echo "*** trying without -lgmodule"
glib_modules= glib_modules=
fi 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_LIBS"; then
if test $glib_modules = gmodule; then if test $glib_modules = gmodule; then
AC_DEFINE(HAVE_GMODULE) AC_DEFINE(HAVE_GMODULE)

2
docs/Makefile.am
View File

@ -1,5 +1,3 @@
docdir = $(datadir)/doc/irssi
man_MANS = \ man_MANS = \
irssi.1 irssi.1

13
src/common.h
View File

@ -43,19 +43,6 @@
# include <gmodule.h> # include <gmodule.h>
#endif #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) #if defined (UOFF_T_INT)
typedef unsigned int uoff_t; typedef unsigned int uoff_t;
#elif defined (UOFF_T_LONG) #elif defined (UOFF_T_LONG)

11
src/fe-common/core/fe-common-core.c
View File

@ -450,18 +450,7 @@ void fe_common_core_finish_init(void)
signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed); signal_add_first("setup changed", (SIGNAL_FUNC) sig_setup_changed);
/* _after_ windows are created.. */ /* _after_ windows are created.. */
#if GLIB_CHECK_VERSION(2,6,0)
g_log_set_default_handler((GLogFunc) glog_func, NULL); 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) if (setup_changed)
signal_emit("setup changed", 0); signal_emit("setup changed", 0);