Changeset 88d631 in git


Ignore:
Timestamp:
Sep 10, 2008, 11:06:37 AM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
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
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/febase.h

    r9db0567 r88d631  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: febase.h,v 1.12 2008-09-10 08:52:27 Singular Exp $ */
     6/* $Id: febase.h,v 1.13 2008-09-10 09:06:37 Singular Exp $ */
    77/*
    88* ABSTRACT: basic i/o
    … …  
    276276
    277277/* the interface for reading: */
    278 extern  char * (*fe_fgets_stdin)(char *pr,char *s, int size);
     278extern  char * (*fe_fgets_stdin)(const char *pr,char *s, int size);
    279279
    280280#ifdef HAVE_DYN_RL
    281 char * fe_fgets_stdin_drl(char *pr,char *s, int size);
     281char * fe_fgets_stdin_drl(const char *pr,char *s, int size);
    282282#endif
    283283
    … …  
    299299#endif
    300300  /* readline, linked in: */
    301   char * fe_fgets_stdin_rl(char *pr,char *s, int size);
     301  char * fe_fgets_stdin_rl(const char *pr,char *s, int size);
    302302
    303303  /* emulated readline: */
    304   char * fe_fgets_stdin_emu(char *pr,char *s, int size);
     304  char * fe_fgets_stdin_emu(const char *pr,char *s, int size);
    305305
    306306  /* fgets: */
    307   char * fe_fgets(char *pr,char *s, int size);
     307  char * fe_fgets(const char *pr,char *s, int size);
    308308
    309309  #ifdef HAVE_TCL
    310310  /* tcl: */
    311   char * fe_fgets_tcl(char *pr,char *s, int size);
     311  char * fe_fgets_tcl(const char *pr,char *s, int size);
    312312  #endif
    313313
    314314  /* dummy (for batch mode): */
    315   char * fe_fgets_dummy(char *pr,char *s, int size);
     315  char * fe_fgets_dummy(const char *pr,char *s, int size);
    316316
    317317#ifdef __cplusplus

  • kernel/feread.cc

    r9db0567 r88d631  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: feread.cc,v 1.10 2007-01-11 09:20:35 Singular Exp $ */
     4/* $Id: feread.cc,v 1.11 2008-09-10 09:06:37 Singular Exp $ */
    55/*
    66* ABSTRACT: input from ttys, simulating fgets
    … …  
    3838#endif
    3939
    40 static char * fe_fgets_stdin_init(char *pr,char *s, int size);
    41 char * (*fe_fgets_stdin)(char *pr,char *s, int size)
     40static char * fe_fgets_stdin_init(const char *pr,char *s, int size);
     41char * (*fe_fgets_stdin)(const char *pr,char *s, int size)
    4242 = fe_fgets_stdin_init;
    4343
    … …  
    146146
    147147
    148 char * fe_fgets_stdin_rl(char *pr,char *s, int size);
     148char * fe_fgets_stdin_rl(const char *pr,char *s, int size);
    149149
    150150/* Tell the GNU Readline library how to complete.  We want to try to complete
    … …  
    205205
    206206#ifndef HAVE_DYN_RL
    207 char * fe_fgets_stdin_rl(char *pr,char *s, int size)
     207char * fe_fgets_stdin_rl(const char *pr,char *s, int size)
    208208{
    209209  if (!BVERBOSE(V_PROMPT))
    … …  
    246246#if !defined(HAVE_READLINE) && defined(HAVE_FEREAD)
    247247extern "C" {
    248 char * fe_fgets_stdin_fe(char *pr,char *s, int size);
    249 }
    250 char * fe_fgets_stdin_emu(char *pr,char *s, int size)
     248char * fe_fgets_stdin_fe(const char *pr,char *s, int size);
     249}
     250char * fe_fgets_stdin_emu(const char *pr,char *s, int size)
    251251{
    252252  if (!BVERBOSE(V_PROMPT))
    … …  
    264264/* some procedure are shared with "static readline" */
    265265#if defined(HAVE_DYN_RL)
    266 char * fe_fgets_stdin_drl(char *pr,char *s, int size)
     266char * fe_fgets_stdin_drl(const char *pr,char *s, int size)
    267267{
    268268  if (!BVERBOSE(V_PROMPT))
    … …  
    302302/* =                        fgets                                   = */
    303303/* ===================================================================*/
    304 char * fe_fgets(char *pr,char *s, int size)
     304char * fe_fgets(const char *pr,char *s, int size)
    305305{
    306306  if (BVERBOSE(V_PROMPT))
    … …  
    318318/* =       init for static rl, dyn. rl, emu. rl                     = */
    319319/* ===================================================================*/
    320 static char * fe_fgets_stdin_init(char *pr,char *s, int size)
     320static char * fe_fgets_stdin_init(const char *pr,char *s, int size)
    321321{
    322322#if (defined(HAVE_READLINE) || defined(HAVE_LIBREADLINE)) && !defined(HAVE_DYN_RL) && !defined(HAVE_FEREAD)
    … …  
    411411#ifdef HAVE_TCL
    412412/* tcl: */
    413 char * fe_fgets_tcl(char *pr,char *s, int size)
     413char * fe_fgets_tcl(const char *pr,char *s, int size)
    414414{
    415415  if(currRing!=NULL) PrintTCLS('P',pr);
    … …  
    425425/* ===================================================================*/
    426426/* dummy (for batch mode): */
    427 char * fe_fgets_dummy(char *pr,char *s, int size)
     427char * fe_fgets_dummy(const char *pr,char *s, int size)
    428428{
    429429  return NULL;
Note: See TracChangeset for help on using the changeset viewer.