Remove Garbage Collection support.

GC support was never enabled by default and nobody in the current
development team seems to care about it.

diff --git a/NEWS b/NEWS
index d92f22e8b6fa53915483f1671d105bbb2d7f85b4..511f495ac9e35b40a96f8ee8be007cede6ed91ad 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
+       + Garbage Collection support has been removed. This will hardly have any
+         effect for anyone given that it has been unsupported for several years.
        + Disable SSLv3 due to the POODLE vulnerability.
        + Try to split long lines on spaces to avoid words being splitted. Adds
          a new option: 'split_line_on_space' which defaults to on.

diff --git a/acconfig.h b/acconfig.h
index cfe623818dc94a73e74c41d787acbfe246e22798..9ace70d8596cd443ca4ed3fe6971eb5f9871d6b0 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,9 +3,6 @@
 #undef HAVE_SOCKS_H
 #undef HAVE_STATIC_PERL
 #undef HAVE_GMODULE
-#undef HAVE_GC_H
-#undef HAVE_GC_GC_H
-#undef USE_GC
 
 /* macros/curses checks */
 #undef HAS_CURSES

diff --git a/configure.ac b/configure.ac
index c312d0652926c06133f5eda8c34982f2c48244b2..e33b8c1d7620f4059eee4803fd8b6bbc67ca6e0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,15 +83,6 @@ if test "x$prefix" != "xNONE"; then
        perl_prefix_note=yes
 fi
 
-AC_ARG_WITH(gc,
-[  --with-gc               Use garbage collector],
-       if test x$withval = xno; then
-               want_gc=no
-       else
-               want_gc=yes
-       fi,
-       want_gc=no)
-
 AC_ARG_WITH(perl-staticlib,
 [  --with-perl-staticlib   Specify that we want to link perl libraries
                           statically in irssi, default is no],
@@ -322,28 +313,6 @@ if test "$enable_ssl" = "yes"; then
   fi
 fi
 
-dnl **
-dnl ** Garbage Collector
-dnl **
-have_gc=no
-if test "x$want_gc" = xyes; then
-  AC_CHECK_LIB(gc, GC_malloc, [
-    AC_CHECK_HEADER(gc/gc.h, [
-      AC_DEFINE(HAVE_GC_GC_H)
-      AC_DEFINE(USE_GC)
-      LIBS="$LIBS -lgc"
-      have_gc=yes
-    ], [
-      AC_CHECK_HEADER(gc.h, [
-       AC_DEFINE(HAVE_GC_H)
-       AC_DEFINE(USE_GC)
-       LIBS="$LIBS -lgc"
-       have_gc=yes
-      ])
-    ])
-  ])
-fi
-
 dnl **
 dnl ** curses checks
 dnl **
@@ -782,7 +751,6 @@ if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then
   fi
 fi
 echo "Building with 64bit DCC support .. : $offt_64bit"
-echo "Building with garbage collector .. : $have_gc"
 echo "Building with DANE support ....... : $have_dane"
 echo "Building with true color support.. : $want_truecolor"
 

diff --git a/src/common.h b/src/common.h
index 1b99753b268e96d796cd2d07fec8fadd982b3228..e907392590aeb98d977247ae346bd47bf1c46d8f 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -56,10 +56,6 @@
 #define g_strcmp0(a, b) (!a ? -(a != b) : (!b ? (a != b) : strcmp(a, b)))
 #endif
 
-#ifdef USE_GC
-#  define g_free(x) G_STMT_START { (x) = NULL; } G_STMT_END
-#endif
-
 #if defined (UOFF_T_INT)
 typedef unsigned int uoff_t;
 #elif defined (UOFF_T_LONG)

diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 6d5b9b13066fd6c7753ab605c883358d41ee6bbd..b1fa5e229ed7b1ab503bb7a8875fb79bef715642 100644 (file)
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -286,22 +286,6 @@ static void winsock_init(void)
 }
 #endif
 
-#ifdef USE_GC
-#ifdef HAVE_GC_H
-#  include <gc.h>
-#else
-#  include <gc/gc.h>
-#endif
-
-GMemVTable gc_mem_table = {
-       GC_malloc,
-       GC_realloc,
-       GC_free,
-
-       NULL, NULL, NULL
-};
-#endif
-
 int main(int argc, char **argv)
 {
        static int version = 0;
@@ -312,10 +296,6 @@ int main(int argc, char **argv)
        };
        int loglev;
 
-#ifdef USE_GC
-       g_mem_set_vtable(&gc_mem_table);
-#endif
-
        core_register_options();
        fe_common_core_register_options();
        args_register(options);
@@ -369,9 +349,6 @@ int main(int argc, char **argv)
        /* Does the same as g_main_run(main_loop), except we
           can call our dirty-checker after each iteration */
        while (!quitting) {
-#ifdef USE_GC
-               GC_collect_a_little();
-#endif
                if (!dummy) term_refresh_freeze();
                g_main_iteration(TRUE);
                 if (!dummy) term_refresh_thaw();