Changeset 2c9190 in git for Singular/feread.cc

Timestamp:

Mar 5, 2003, 7:02:09 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

8f8f304ee82b5d608a9e311cd5d94500ecb692be

Parents:

f4e8075609f1fb2519859dd7474eb829aac37881

Message:

*hannes: backport to gcc2/readline2


git-svn-id: file:///usr/local/Singular/svn/trunk@6572 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/feread.cc (modified) (4 diffs)

Singular/feread.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feread.cc,v 1.47 2003-03-04 19:35:03 bricken Exp $ */
+/* $Id: feread.cc,v 1.48 2003-03-05 18:02:09 Singular Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -8 +8 @@
 
 #include "mod2.h"
+
+// ----------------------------------------
+// system settings:
+#undef USE_GCC3
+#undef USE_READLINE4
+//----------------------------------------
 #ifdef ix86_Win
 #define READLINE_STATIC
@@ -26 +32 @@
 #undef HAVE_DYN_RL
 #endif
+
+#ifndef USE_READLINE4
+#define rl_filename_completion_function filename_completion_function
+#define rl_completion_matches           completion_matches
+#endif
+
 
 #ifdef HAVE_TCL
@@ -370 +382 @@
   rl_readline_name = "Singular";
   /* Tell the completer that we want a crack first. */
+#ifdef USE_GCC3
   rl_attempted_completion_function = (RL_CPPFunction *)singular_completion;
+#else
+  rl_attempted_completion_function = (CPPFunction *)singular_completion;
+#endif
 
   /* set the output stream */