Remove workaround for old readline lib.

4 files changed, 2 insertions, 73 deletions

diff --git a/plpftp/Makefile.am b/plpftp/Makefile.am
index c111fe8..2301f56 100644
--- a/plpftp/Makefile.am
+++ b/plpftp/Makefile.am
@@ -4,8 +4,8 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 bin_PROGRAMS = plpftp
 plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
-plpftp_SOURCES = ftp.cc main.cc rlcrap.c
-EXTRA_DIST = ftp.h rlcrap.h
+plpftp_SOURCES = ftp.cc main.cc
+EXTRA_DIST = ftp.h
 
 maintainer-clean-local:
 	rm -f Makefile.in
diff --git a/plpftp/ftp.cc b/plpftp/ftp.cc
index 9c8a127..d30bd16 100644
--- a/plpftp/ftp.cc
+++ b/plpftp/ftp.cc
@@ -58,7 +58,6 @@ extern "C"  {
 #if HAVE_LIBHISTORY
 #include <readline/history.h>
 #endif
-#include "rlcrap.h"
 }
 #endif
 
@@ -1240,13 +1239,8 @@ initReadline(void)
     rl_readline_name = "plpftp";
     rl_completion_entry_function = FUNCAST(null_completion);
     rl_attempted_completion_function = CPFUNCAST(do_completion);
-#if (READLINE_VERSION < 402)
-    rlcrap_setpointers(command_generator, filename_generator);
-#endif
-#if (READLINE_VERSION >= 402)
     rl_basic_word_break_characters = " \t\n\"\\'`@><=;|&{(";
 #endif
-#endif
 }
 
 void ftp::
diff --git a/plpftp/rlcrap.c b/plpftp/rlcrap.c
deleted file mode 100644
index 519daf3..0000000
--- a/plpftp/rlcrap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Woraround for crappy readline.h which defines wrong prototypes.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#if HAVE_LIBREADLINE
-#include <stdio.h>
-#include "rlcrap.h"
-
-CPFunction *cmdgen_ptr;
-CPFunction *fnmgen_ptr;
-
-void rlcrap_setpointers(CorrectFunProto cgp, CorrectFunProto fgp) {
-	cmdgen_ptr = cgp;
-	fnmgen_ptr = fgp;
-}
-#endif
diff --git a/plpftp/rlcrap.h b/plpftp/rlcrap.h
deleted file mode 100644
index eb0994c..0000000
--- a/plpftp/rlcrap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-*-c++-*-
- * $Id$
- *
- * This file is part of plptools.
- *
- *  Copyright (C) 1999  Philip Proudman <philip.proudman@btinternet.com>
- *  Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#if HAVE_LIBREADLINE
-#include <readline/readline.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern CPFunction *cmdgen_ptr;
-extern CPFunction *fnmgen_ptr;
-
-typedef char *(*CorrectFunProto)(char *, int);
-
-extern void rlcrap_setpointers(CorrectFunProto, CorrectFunProto);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/*
- * Local variables:
- * c-basic-offset: 4
- * End:
- */