summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2008-02-05 01:01:06 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2008-02-05 01:01:06 +0000
commit4fb888ce80f9185d5635a9722dc7b28f4cdf4800 (patch)
treed78709052620735f32dbec7b3c07f2f9774b665a
parentffe5bd693092ed66840a64d8c0164c5999fc4adb (diff)
downloadirssi-4fb888ce80f9185d5635a9722dc7b28f4cdf4800.zip
Remove support for perl 5.004 and older.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4706 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--INSTALL3
-rw-r--r--TODO2
-rw-r--r--acconfig.h1
-rw-r--r--configure.in7
-rw-r--r--src/perl/module.h5
-rw-r--r--src/perl/perl-common.c4
-rw-r--r--src/perl/perl-common.h6
-rw-r--r--src/perl/perl-core.c5
8 files changed, 0 insertions, 33 deletions
diff --git a/INSTALL b/INSTALL
index 3deb368f..02e171b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,9 +47,6 @@ as well. If you want to use only curses calls for some reason, use
Perl support generates most of the problems. There's quite a many
things that can go wrong:
- - Perl 5.004 doesn't work by default, you'll need to edit
- src/perl/irssi-core.pl and remove all lines with "delete_package"
- in them.
- Compiling fails if you compile irssi with GCC in a system that has
perl compiled with some other C compiler. Very common problem with
non-Linux/BSD systems. You'll need to edit src/perl/*/Makefile files
diff --git a/TODO b/TODO
index 746e2af4..daa38a3d 100644
--- a/TODO
+++ b/TODO
@@ -568,8 +568,6 @@ FIXME translate
signal_add() it
- Irssi::keyboard_entry_redirect()
- Irssi::format_get_text()
- - "use Symbol(delete_package)" doesn't work with perl 5.004 and crashes
- irssi .. at least remove the crashing!
- Irssi::signal_remove() could accept hashes
- /command parameter parser so it'd be easier to handle -options etc.
- Try to get the Makefiles generated so that compiling with GCC would
diff --git a/acconfig.h b/acconfig.h
index eec275b5..cfe62381 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,7 +1,6 @@
/* misc.. */
#undef HAVE_IPV6
#undef HAVE_SOCKS_H
-#undef HAVE_PL_PERL
#undef HAVE_STATIC_PERL
#undef HAVE_GMODULE
#undef HAVE_GC_H
diff --git a/configure.in b/configure.in
index e50f647e..b33f4432 100644
--- a/configure.in
+++ b/configure.in
@@ -477,13 +477,6 @@ if test "$want_perl" != "no"; then
else
PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts 2>/dev/null`
- dnl * Perl 5.004 and older use perl_xxx variables while
- dnl * later use PL_perl_xxx variables ..
- have_pl_perl=`$perlpath -e 'print $] < 5.005 ? "no" : "yes";'`
- if test "x$have_pl_perl" = "xyes"; then
- AC_DEFINE(HAVE_PL_PERL)
- fi
-
if test "x$DYNLIB_MODULES" = "xno" -a "$want_perl" != "static"; then
dnl * wanted perl as module, won't get it.
want_perl=static
diff --git a/src/perl/module.h b/src/perl/module.h
index 9a2e8063..2fd15137 100644
--- a/src/perl/module.h
+++ b/src/perl/module.h
@@ -10,11 +10,6 @@
# undef _
# undef PACKAGE
-/* For compatibility with perl 5.004 and older */
-# ifndef ERRSV
-# define ERRSV GvSV(errgv)
-# endif
-
extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implementations won't work */
#endif
diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c
index 9fe8d587..517e6102 100644
--- a/src/perl/perl-common.c
+++ b/src/perl/perl-common.c
@@ -48,10 +48,6 @@ typedef struct {
PERL_OBJECT_FUNC fill_func;
} PERL_OBJECT_REC;
-#ifndef HAVE_PL_PERL
-STRLEN PL_na;
-#endif
-
static GHashTable *iobject_stashes, *plain_stashes;
static GSList *use_protocols;
diff --git a/src/perl/perl-common.h b/src/perl/perl-common.h
index 32e6e655..e2992ee9 100644
--- a/src/perl/perl-common.h
+++ b/src/perl/perl-common.h
@@ -26,12 +26,6 @@ char *perl_function_get_package(const char *function);
Increases the reference counter for the return value. */
SV *perl_func_sv_inc(SV *func, const char *package);
-/* For compatibility with perl 5.004 and older */
-#ifndef HAVE_PL_PERL
-# define PL_sv_undef sv_undef
-extern STRLEN PL_na;
-#endif
-
#ifndef pTHX_
# define pTHX_
#endif
diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c
index 1f6188be..5e401ead 100644
--- a/src/perl/perl-core.c
+++ b/src/perl/perl-core.c
@@ -34,11 +34,6 @@
#include "XSUB.h"
#include "irssi-core.pl.h"
-/* For compatibility with perl 5.004 and older */
-#ifndef HAVE_PL_PERL
-# define PL_perl_destruct_level perl_destruct_level
-#endif
-
GSList *perl_scripts;
PerlInterpreter *my_perl;