Changeset dcb1b7 in git


Ignore:
Timestamp:
Jul 27, 2005, 11:46:20 AM (19 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
48ce9a6586315bf81f1feb56a74edfe29d400294
Parents:
0cbc03bb27f9fe962c2afb4faaaa825bdb7bed7c
Message:
*hannes: removed MWERKS and macintosh (Mac 9) code


git-svn-id: file:///usr/local/Singular/svn/trunk@8457 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/feResource.cc

    r0cbc03 rdcb1b7  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: feResource.cc,v 1.6 2005-07-25 09:09:41 wienand Exp $ */
     4/* $Id: feResource.cc,v 1.7 2005-07-27 09:46:19 Singular Exp $ */
    55/*
    66* ABSTRACT: management of resources
     
    3838#if defined(ix86_Win) && ! defined(__CYGWIN__)
    3939#define SINGULAR_DEFAULT_DIR "/Singular/"S_VERSION1
    40 #elif defined(macintosh)
    41 #define SINGULAR_DEFAULT_DIR "Macintosh HD:Singular:"S_VERSION1
    4240#else // unix
    4341#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
     
    9593  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    ""},
    9694  {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",              ""},
    97 //#if !defined(macintosh)
    98 //  {"netscape",  'N',    feResBinary,"NETSCAPE",             "%b/netscape",          ""},
    99 //  {"info",      'I',    feResBinary,"INFO",                 "%b/info",              ""},
    100 //  {"tkinfo",    'T',    feResBinary,"TKINFO",               "%b/tkinfo",            ""},
    10195  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
    102 //#endif // ! defined(macintosh)
    10396
    10497#ifdef ESINGULAR
     
    133126#if defined(ix86_Win)
    134127';'
    135 #elif defined(macintosh)
    136 ','
    137128#else
    138129':'
     
    418409    return NULL;
    419410  }
    420 #ifndef macintosh
    421411#ifdef ix86_Win // stupid WINNT sometimes gives you argv[0] within ""
    422412  if (*feArgv0 == '"')
     
    446436  }
    447437  return omStrDup(value);
    448 #else // macintosh
    449   return feArgv0;
    450 #endif
    451438}
    452439
     
    554541  }
    555542
    556 #ifdef macintosh
    557   // replace / and .. by DIR_SEP and UP_DIR
    558   fn = fname;
    559   while (*fn != NULL)
    560   {
    561     if (*fn == '.' && *(fn + 1) == '.')
    562     {
    563       mystrcpy(fn , fn + 2);
    564     }
    565     else
    566     {
    567       if (*fn == '/') *fn = DIR_SEP;
    568       fn++;
    569     }
    570   }
    571 #endif
    572 
    573543#ifdef RESOURCE_DEBUG
    574544  printf("feCleanUpFile: leaving with =%s=\n", fname);
  • kernel/febase.cc

    r0cbc03 rdcb1b7  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: febase.cc,v 1.5 2005-07-26 17:04:15 Singular Exp $ */
     4/* $Id: febase.cc,v 1.6 2005-07-27 09:46:19 Singular Exp $ */
    55/*
    66* ABSTRACT: i/o system
     
    3838/*0 implementation */
    3939
    40 char fe_promptstr[]
    41 #ifdef macintosh
    42                    =" \n";
    43 #else
    44                    ="  ";
    45 #endif
     40char fe_promptstr[] ="  ";
    4641
    4742#define INITIAL_PRINT_BUFFER 24*1024
     
    5146int     si_echo = 0;
    5247int     printlevel = 0;
    53 #ifndef macintosh
    5448int     pagelength = 24;
    55 #else
    56 int     pagelength = -1;
    57 #endif
    5849int     colmax = 80;
    5950char    prompt_char = '>'; /*1 either '>' or '.'*/
     
    7162BOOLEAN feWarn = TRUE;
    7263BOOLEAN feOut = TRUE;
    73 
    74 #ifdef macintosh
    75 static  int lines = 0;
    76 static  int cols = 0;
    77 #endif
    7864
    7965const char feNotImplemented[]="not implemented";
     
    456442{
    457443  fe_promptstr[0]=prompt_char;
    458 #ifdef macintosh
    459   cols = 0;
    460   printf(fe_promptstr);mflush();
    461 #endif
    462444}
    463445
     
    797779        strcat(s, DIR_SEPP);
    798780        strcat(s, path);
    799         #ifndef macintosh
    800           if(!access(s, R_OK)) { found++; break; }
    801         #else
    802           f=fopen(s,mode); /* do not need myfopen: we test only the access */
    803           if (f!=NULL)  { found++; fclose(f); break; }
    804         #endif
     781        if(!access(s, R_OK)) { found++; break; }
    805782        p = q+1;
    806783      }
     
    1020997
    1021998
    1022 #ifdef macintosh
    1023 static  int lines = 0;
    1024 static  int cols = 0;
    1025 
    1026 void mwrite(uchar c)
    1027 {
    1028   if (c == '\n')
    1029   {
    1030     cols = 0;
    1031     if (lines == pagelength)
    1032     {
    1033       lines = 0;
    1034       fputs("pause>\n",stderr);
    1035       uchar c = fgetc(stdin);
    1036     }
    1037     else
    1038     {
    1039       lines++;
    1040       fePutChar(c);
    1041     }
    1042   }
    1043   else
    1044   {
    1045     fePutChar(c);
    1046     cols++;
    1047     if (cols == colmax)
    1048     {
    1049       // cols = 0;   //will be done by mwrite('\n');
    1050       mwrite('\n');
    1051     }
    1052   }
    1053 }
    1054 #endif
    1055 
    1056999// some routines which redirect the output of print to a string
    10571000static char* sprint = NULL;
     
    11001043  {
    11011044
    1102 #ifdef macintosh
    1103     char c;
    1104     while ('\0' != (c = *s++))
    1105     {
    1106       mwrite(c);
    1107     }
    1108 #else
    11091045#ifdef HAVE_TCL
    11101046    if (tclmode)
     
    11221058      }
    11231059    }
    1124 #endif
    11251060  }
    11261061}
     
    11661101    if(tclmode)
    11671102#endif
    1168 #if (defined(HAVE_TCL) || defined(macintosh))
     1103#if defined(HAVE_TCL)
    11691104    {
    11701105      char *s=(char *)omAlloc(strlen(fmt)+256);
     
    11731108      PrintTCLS('N',s);
    11741109#endif
    1175 #ifdef macintosh
    1176       char c;
    1177       while ('\0' != (c = *s++))
    1178       {
    1179         mwrite(c);
    1180       }
    1181       if (feProt&PROT_O)
    1182       {
    1183         vfprintf(feProtFile,fmt,ap);
    1184       }
    1185 #endif
    1186     }
    1187 #endif
    1188 #if !defined(macintosh) || defined(HAVE_TCL)
     1110    }
     1111#endif
    11891112#ifdef HAVE_TCL
    11901113    else
    1191 #endif
    11921114    {
    11931115      vfprintf(stdout, fmt, ap);
  • kernel/febase.h

    r0cbc03 rdcb1b7  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: febase.h,v 1.3 2005-07-26 17:04:15 Singular Exp $ */
     6/* $Id: febase.h,v 1.4 2005-07-27 09:46:20 Singular Exp $ */
    77/*
    88* ABSTRACT: basic i/o
     
    1313
    1414/* define DIR_SEPP, etc */
    15 #ifdef macintosh /* mac os 9 */
    16 #  define  DIR_SEP ':'
    17 #  define  DIR_SEPP ":"
    18 #  define  UP_DIR ""
    19 #else  /* unix , WINNT */
     15/* unix , WINNT */
    2016#  define  DIR_SEP '/'
    2117#  define  DIR_SEPP "/"
    2218#  define  UP_DIR ".."
    23 #endif  /* macintosh */
    2419// this might still get reset by feInitResources
    2520extern char fePathSep;
  • kernel/ffields.cc

    r0cbc03 rdcb1b7  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ffields.cc,v 1.1.1.1 2003-10-06 12:15:52 Singular Exp $ */
     4/* $Id: ffields.cc,v 1.2 2005-07-27 09:46:20 Singular Exp $ */
    55/*
    66* ABSTRACT: finite fields with a none-prime number of elements (via tables)
     
    618618    else     nfCharQ = -c;
    619619    char buf[100];
    620 #ifdef macintosh
    621     sprintf(buf,"gftables:%d",nfCharQ);
    622 #else
    623620    sprintf(buf,"gftables/%d",nfCharQ);
    624 #endif
    625621    FILE * fp = feFopen(buf,"r",NULL,TRUE);
    626622    if (fp==NULL)
  • kernel/misc.cc

    r0cbc03 rdcb1b7  
    125125*
    126126*#ifndef MSDOS
    127 *#ifndef macintosh
    128127*#include <sys/times.h>
    129128*#include <sys/resource.h>
     
    136135*  sleep(10);
    137136*}
    138 *#else
    139 *void very_nice(){}
    140 *#endif
    141137*#else
    142138*void very_nice(){}
Note: See TracChangeset for help on using the changeset viewer.