Changeset 88d631 in git for kernel/feread.cc

Timestamp:

Sep 10, 2008, 11:06:37 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0ec43aa4fa51ba4c252139582250a242e5dffa42

Parents:

9db056766710393a837733e7b1f765e86500c2ff

Message:

*hannes: gcc 4.2 fixes


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

File:

• kernel/feread.cc (modified) (10 diffs)

kernel/feread.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feread.cc,v 1.10 2007-01-11 09:20:35 Singular Exp $ */
+/* $Id: feread.cc,v 1.11 2008-09-10 09:06:37 Singular Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -38 +38 @@
 #endif
 
-static char * fe_fgets_stdin_init(char *pr,char *s, int size);
-char * (*fe_fgets_stdin)(char *pr,char *s, int size)
+static char * fe_fgets_stdin_init(const char *pr,char *s, int size);
+char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
  = fe_fgets_stdin_init;
 
@@ -146 +146 @@
 
 
-char * fe_fgets_stdin_rl(char *pr,char *s, int size);
+char * fe_fgets_stdin_rl(const char *pr,char *s, int size);
 
 /* Tell the GNU Readline library how to complete.  We want to try to complete
@@ -205 +205 @@
 
 #ifndef HAVE_DYN_RL
-char * fe_fgets_stdin_rl(char *pr,char *s, int size)
+char * fe_fgets_stdin_rl(const char *pr,char *s, int size)
 {
   if (!BVERBOSE(V_PROMPT))
@@ -246 +246 @@
 #if !defined(HAVE_READLINE) && defined(HAVE_FEREAD)
 extern "C" {
-char * fe_fgets_stdin_fe(char *pr,char *s, int size);
-}
-char * fe_fgets_stdin_emu(char *pr,char *s, int size)
+char * fe_fgets_stdin_fe(const char *pr,char *s, int size);
+}
+char * fe_fgets_stdin_emu(const char *pr,char *s, int size)
 {
   if (!BVERBOSE(V_PROMPT))
@@ -264 +264 @@
 /* some procedure are shared with "static readline" */
 #if defined(HAVE_DYN_RL)
-char * fe_fgets_stdin_drl(char *pr,char *s, int size)
+char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
 {
   if (!BVERBOSE(V_PROMPT))
@@ -302 +302 @@
 /* =                        fgets                                   = */
 /* ===================================================================*/
-char * fe_fgets(char *pr,char *s, int size)
+char * fe_fgets(const char *pr,char *s, int size)
 {
   if (BVERBOSE(V_PROMPT))
@@ -318 +318 @@
 /* =       init for static rl, dyn. rl, emu. rl                     = */
 /* ===================================================================*/
-static char * fe_fgets_stdin_init(char *pr,char *s, int size)
+static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
 {
 #if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
@@ -411 +411 @@
 #ifdef HAVE_TCL
 /* tcl: */
-char * fe_fgets_tcl(char *pr,char *s, int size)
+char * fe_fgets_tcl(const char *pr,char *s, int size)
 {
   if(currRing!=NULL) PrintTCLS('P',pr);
@@ -425 +425 @@
 /* ===================================================================*/
 /* dummy (for batch mode): */
-char * fe_fgets_dummy(char *pr,char *s, int size)
+char * fe_fgets_dummy(const char *pr,char *s, int size)
 {
   return NULL;