Changeset 111cfe in git


Ignore:
Timestamp:
Jul 26, 2005, 7:06:59 PM (19 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
5c32833552c1f18e3ee320d4cc4d3c0176d81734
Parents:
aaa49cc6aa7665f191223675066ceaf1f337254e
Message:
*hannes: removed MWERKS


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

Legend:

Unmodified
Added
Removed
  • Singular/claptmpl.cc

    raaa49c r111cfe  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: claptmpl.cc,v 1.27 2005-06-13 16:24:43 Singular Exp $
     5// $Id: claptmpl.cc,v 1.28 2005-07-26 17:06:54 Singular Exp $
    66/*
    77* ABSTRACT - instantiation of all templates
     
    2626    #include <templates/ftmpl_functions.h>
    2727    #include <templates/ftmpl_matrix.cc>
    28     #ifdef __MWERKS__
    29       template List<CanonicalForm> Difference<CanonicalForm>(const List<CanonicalForm>&,const List<CanonicalForm>&);
    30       template List<CanonicalForm> Union<CanonicalForm>(const List<CanonicalForm>&,const List<CanonicalForm>&);
    31       template List<CFFactor> Union<CFFactor>(const List<CFFactor>&,const List<CFFactor>&);
    32       template List<Variable> Union<Variable> ( const List<Variable>&, const List<Variable>& );
    33       template List<Variable> Difference<Variable> ( const List<Variable>&, const List<Variable>& );
    34       template int operator==<CanonicalForm> ( const Factor<CanonicalForm>&, const Factor<CanonicalForm>& );
    35     #endif
    3628
    3729    template class Factor<CanonicalForm>;
     
    5850    #endif
    5951
    60     #ifndef __MWERKS__
    61       template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
    62       template int operator == ( const Factor<CanonicalForm>&, const Factor<CanonicalForm>& );
    63 
    64       template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
    65       template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
    66 
    67       template Variable tmax ( const Variable&, const Variable& );
    68       template Variable tmin ( const Variable&, const Variable& );
    69 
    70       template int tmax ( const int&, const int& );
    71       template int tmin ( const int&, const int& );
    72       template int tabs ( const int& );
    73     #endif
     52    template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
     53    template int operator == ( const Factor<CanonicalForm>&, const Factor<CanonicalForm>& );
     54
     55    template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
     56    template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
     57
     58    template Variable tmax ( const Variable&, const Variable& );
     59    template Variable tmin ( const Variable&, const Variable& );
     60
     61    template int tmax ( const int&, const int& );
     62    template int tmin ( const int&, const int& );
     63    template int tabs ( const int& );
    7464
    7565  #endif
     
    158148    template class ListIterator<Variable> ;
    159149
    160     #ifndef __MWERKS__
    161       template List<Variable> Union ( const List<Variable>&, const List<Variable>& );
    162       template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );
    163 
    164       template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
    165       template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
    166     #endif
     150    template List<Variable> Union ( const List<Variable>&, const List<Variable>& );
     151    template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );
     152
     153    template List<CanonicalForm> Union ( const List<CanonicalForm>&, const List<CanonicalForm>& );
     154    template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const List<CanonicalForm>& );
    167155
    168156// for charsets:
  • Singular/extra.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.227 2005-06-28 14:41:37 Singular Exp $ */
     4/* $Id: extra.cc,v 1.228 2005-07-26 17:06:54 Singular Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    1616#include "mod2.h"
    1717
    18 #ifndef __MWERKS__
    1918#ifdef TIME_WITH_SYS_TIME
    2019# include <time.h>
     
    3332#endif
    3433
    35 #endif
    3634#include <unistd.h>
    3735
     
    216214    {
    217215      res->rtyp=INT_CMD;
    218       #ifndef __MWERKS__
    219216      if (h==NULL) res->data = (void *)system("sh");
    220217      else if (h->Typ()==STRING_CMD)
     
    222219      else
    223220        WerrorS("string expected");
    224       #else
    225       res->data=(void *)0;
    226       #endif
    227221      return FALSE;
    228222    }
     
    308302      res->rtyp=INT_CMD;
    309303    #ifndef MSDOS
    310     #ifndef __MWERKS__
    311304      res->data=(void *)getpid();
    312     #else
    313       res->data=(void *)1;
    314     #endif
    315305    #else
    316306      res->data=(void *)1;
     
    20902080#endif
    20912081/*==================== alarm ==================================*/
    2092 #ifndef __MWERKS__
    20932082#ifndef MSDOS
    20942083#ifndef atarist
     
    21112100    }
    21122101    else
    2113 #endif
    21142102#endif
    21152103#endif
  • Singular/fegetopt.h

    raaa49c r111cfe  
    101101#define optional_argument        2
    102102
    103 #if __STDC__ || defined(PROTO) || defined(__MWERKS__)
     103#if __STDC__ || defined(PROTO)
    104104/* #if defined(__GNU_LIBRARY__)*/
    105105/* Many other libraries have conflicting prototypes for getopt, with
  • Singular/grammar.y

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: grammar.y,v 1.112 2005-05-18 17:57:04 Singular Exp $ */
     4/* $Id: grammar.y,v 1.113 2005-07-26 17:06:56 Singular Exp $ */
    55/*
    66* ABSTRACT: SINGULAR shell grammatik
     
    1313#include <stdarg.h>
    1414#include <string.h>
    15 #ifdef __MWERKS__
    16   #ifdef __POWERPC__
    17     #include <alloca.h>
    18   #else
    19     #ifdef macintosh
    20       #define alloca malloc /* this is not corect! */
    21     #else
    22       #include <malloc.h>
    23     #endif
    24   #endif
    25 #endif
    2615
    2716#include "mod2.h"
  • Singular/iparith.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.370 2005-07-25 13:01:28 bricken Exp $ */
     4/* $Id: iparith.cc,v 1.371 2005-07-26 17:06:56 Singular Exp $ */
    55
    66/*
     
    60336033}
    60346034
    6035 #ifndef __MWERKS__
    60366035#if defined(__alpha) && !defined(linux)
    60376036extern "C"
     
    60726071  return FALSE;
    60736072}
    6074 #endif
    60756073static BOOLEAN jjSUBST_M(leftv res, leftv u)
    60766074{
     
    61466144,{jjCALL2ARG,  STATUS_CMD,      STRING_CMD,          2       ALLOW_PLURAL}
    61476145,{jjCALL3ARG,  STATUS_CMD,      INT_CMD,             3       ALLOW_PLURAL}
    6148 #ifndef __MWERKS__
    61496146,{jjSTATUS_M,  STATUS_CMD,      INT_CMD,             4       ALLOW_PLURAL}
    6150 #endif
    61516147,{loSimplex,   SIMPLEX_CMD,     LIST_CMD,            6       NO_PLURAL}
    61526148,{nuUResSolve, URSOLVE_CMD,     LIST_CMD,            4       NO_PLURAL}
  • Singular/libparse.l

    raaa49c r111cfe  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 /* $Id: libparse.l,v 1.57 2005-05-23 08:45:53 Singular Exp $ */
     5/* $Id: libparse.l,v 1.58 2005-07-26 17:06:58 Singular Exp $ */
    66#include <stdio.h>
    77#include <string.h>
     
    7777};
    7878int yylp_errno = 0;
    79 
    80 #ifdef __MWERKS__
    81 #ifdef __cplusplus
    82 extern "C" {
    83 #endif
    84 long   ftell(FILE *fp);
    85 #ifdef macintosh
    86 int    fileno(FILE *stream);
    87 FILE   *fdopen(int filedes, char *type);
    88 int    isatty(int filedes);
    89 #else
    90 int    _fileno(FILE *stream);
    91 FILE   *_fdopen(int filedes, char *type);
    92 int    _isatty(int filedes);
    93 #define fileno  _fileno
    94 #define fdopen  _fdopen
    95 #define isatty  _isatty
    96 #endif /* macintosh */
    97 #ifdef __cplusplus
    98 }
    99 #endif
    100 #endif
    10179
    10280#ifdef STANDALONE_PARSER
  • Singular/misc.cc

    raaa49c r111cfe  
    558558#endif
    559559#ifndef __OPTIMIZE__
    560 #ifdef __MWERKS__
    561               StringAppendS(" Codewarrior 2.0,");
    562 #else
    563560              StringAppendS("-g,");
    564 #endif
    565561#endif
    566562#ifdef HAVE_EIGENVAL
  • Singular/mod2.h.in

    raaa49c r111cfe  
    66 *          DO NOT EDIT!
    77 *
    8  *  Version: $Id: mod2.h.in,v 1.110 2005-04-28 12:25:32 hannes Exp $
     8 *  Version: $Id: mod2.h.in,v 1.111 2005-07-26 17:06:58 Singular Exp $
    99 *******************************************************************/
    1010#ifndef MOD2_H
     
    162162/* Undefine to disable Gerhard's and Wilfried's fast and dirty std computations */
    163163#define FAST_AND_DIRTY
    164 #ifdef __MWERKS__
    165 /* includes for Metrowerks */
    166 #include "mod2.mwerks.h"
    167 #endif
    168164
    169165/* eigenvalues */
  • Singular/ndbm.cc

    raaa49c r111cfe  
    55//**************************************************************************/
    66//
    7 // $Id: ndbm.cc,v 1.14 2000-11-22 16:38:54 Singular Exp $
     7// $Id: ndbm.cc,v 1.15 2005-07-26 17:06:58 Singular Exp $
    88//
    99//**************************************************************************/
     
    3939#   define ENOSPC 28
    4040#   define L_SET SEEK_SET
    41 #ifdef macintosh
    42 #   include <stdlib.h>
    43 #   include <errno.h>
    44 #   include "fcntl.h"
    45 #   include <string.h>
    46 #   include <stat.h>
    47 //#   include <stat.h>
    48 #else
    49 #   include <unix.h>
    50 #   include <ThreadLocalData.h>
    51 #endif
    5241#else
    5342#   include <sys/types.h>
     
    7766static  int delitem(char buf[PBLKSIZ], int n);
    7867static  int additem(char buf[PBLKSIZ], datum item, datum item1);
    79 #if defined(__MWERKS__) && ! defined(macintosh)
    80 #define errno (_GetThreadLocalData()->errno)
    81 #else
    8268extern  int errno;
    83 #endif
    8469
    8570DBM *
     
    10893  strcpy(db->dbm_pagbuf, file);
    10994  strcat(db->dbm_pagbuf, ".pag");
    110 #ifdef __MWERKS__
    111   db->dbm_pagf = open(db->dbm_pagbuf, flags);
    112 #else /* not __MWERKS__ */
    11395  db->dbm_pagf = open(db->dbm_pagbuf, flags, mode);
    114 #endif /* __MWERKS__ */
    11596  if (db->dbm_pagf < 0)
    11697    goto bad;
    11798  strcpy(db->dbm_pagbuf, file);
    11899  strcat(db->dbm_pagbuf, ".dir");
    119 #ifdef __MWERKS__
    120   db->dbm_dirf = open(db->dbm_pagbuf, flags);
    121 #else /* not __MWERKS__ */
    122100  db->dbm_dirf = open(db->dbm_pagbuf, flags, mode);
    123 #endif /* __MWERKS__ */
    124101  if (db->dbm_dirf < 0)
    125102    goto bad1;
  • Singular/tesths.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.98 2005-05-03 09:35:17 Singular Exp $ */
     4/* $Id: tesths.cc,v 1.99 2005-07-26 17:06:58 Singular Exp $ */
    55
    66/*
     
    5959  extern void ttGen2();
    6060  extern void ttGen4();
    61   #ifndef __MWERKS__
    62     extern void mpsr_ttGen(); // For initialization of (CMD, MP_COP) tables
    63     mpsr_ttGen();
    64   #endif
     61  extern void mpsr_ttGen(); // For initialization of (CMD, MP_COP) tables
     62  mpsr_ttGen();
    6563  ttGen4();
    6664  ttGen1();
  • Singular/utils.cc

    raaa49c r111cfe  
    55#include "fegetopt.h"
    66#include "utils.h"
    7 #ifdef __MWERKS__
    8 #define __GNU_LIBRARY__
    9 #include "fegetopt.h"
    10 #endif
    117
    128extern FILE *yylpin;
  • Singular/weight.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: weight.cc,v 1.23 2003-03-11 16:54:06 Singular Exp $ */
     4/* $Id: weight.cc,v 1.24 2005-07-26 17:06:59 Singular Exp $ */
    55
    66/*
     
    2222
    2323/*0 implementation*/
    24 #ifndef __MWERKS__
    2524extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
    2625       double *rel, double wx);
     
    3736extern "C" void wGcd(int *x, int n);
    3837extern double wNsqr;
    39 #else
    40 #include "weight0.c"
    41 #endif /* __MWERKS__ */
    4238
    4339static void wDimensions(polyset s, int sl, int *lpol, int *npol, int *mons)
  • kernel/febase.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: febase.cc,v 1.4 2005-01-13 15:22:23 Singular Exp $ */
     4/* $Id: febase.cc,v 1.5 2005-07-26 17:04:15 Singular Exp $ */
    55/*
    66* ABSTRACT: i/o system
     
    1717#include <sys/stat.h>
    1818#include <ctype.h>
    19 #ifndef __MWERKS__
    2019#include <unistd.h>
    21 #endif
    2220#ifdef NeXT
    2321#include <sys/file.h>
     
    695693}
    696694
    697 #ifdef __MWERKS__
    698 #ifdef __cplusplus
    699 extern "C" {
    700 #endif
    701 #ifdef macintosh
    702 int    isatty(int filedes);
    703 #else
    704 int    _isatty(int filedes);
    705 #define isatty  _isatty
    706 #endif /* macintosh */
    707 #ifdef __cplusplus
    708 }
    709 #endif
    710 #endif
    711695/*2
    712696* init all data structures
     
    925909}
    926910
    927 #ifndef __MWERKS__
    928911#ifdef HAVE_TCL
    929912extern "C" {
     
    934917}
    935918}
    936 #endif
    937919#endif
    938920
  • kernel/febase.h

    raaa49c r111cfe  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: febase.h,v 1.2 2005-05-04 07:50:49 Singular Exp $ */
     6/* $Id: febase.h,v 1.3 2005-07-26 17:04:15 Singular Exp $ */
    77/*
    88* ABSTRACT: basic i/o
     
    211211                int path_only=FALSE);
    212212
    213 #ifndef __MWERKS__
    214213#ifdef HAVE_TCL
    215214
     
    224223#define PrintTCL(A,B,C) Print("TCL-Err:%s",C)
    225224#endif /* HAVE_TCL */
    226 #endif /* __MWERKS__ */
    227225
    228226char *  StringAppend(char *fmt, ...);
  • kernel/fegetopt.h

    raaa49c r111cfe  
    101101#define optional_argument        2
    102102
    103 #if __STDC__ || defined(PROTO) || defined(__MWERKS__)
     103#if __STDC__ || defined(PROTO)
    104104/* #if defined(__GNU_LIBRARY__)*/
    105105/* Many other libraries have conflicting prototypes for getopt, with
  • kernel/mod2.h.in

    raaa49c r111cfe  
    66 *          DO NOT EDIT!
    77 *
    8  *  Version: $Id: mod2.h.in,v 1.4 2005-05-02 15:47:35 Singular Exp $
     8 *  Version: $Id: mod2.h.in,v 1.5 2005-07-26 17:04:15 Singular Exp $
    99 *******************************************************************/
    1010#ifndef MOD2_H
     
    160160/* Undefine to disable Gerhard's and Wilfried's fast and dirty std computations */
    161161#define FAST_AND_DIRTY
    162 #ifdef __MWERKS__
    163 /* includes for Metrowerks */
    164 #include "mod2.mwerks.h"
    165 #else
    166 /* works around a quirk in gcc in the generation of parser tables */
    167 #define INIT_BUG
    168 #endif
    169162
    170163/* eigenvalues */
  • kernel/timer.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: timer.cc,v 1.1.1.1 2003-10-06 12:16:04 Singular Exp $ */
     4/* $Id: timer.cc,v 1.2 2005-07-26 17:04:15 Singular Exp $ */
    55
    66/*
     
    1111
    1212//the mpw timer is quite the same as the dos timer:
    13 #ifdef __MWERKS__
    14 #define MSDOS
    15 #endif
    1613
    1714int        timerv = 0;
  • kernel/weight.cc

    raaa49c r111cfe  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: weight.cc,v 1.1.1.1 2003-10-06 12:15:56 Singular Exp $ */
     4/* $Id: weight.cc,v 1.2 2005-07-26 17:04:15 Singular Exp $ */
    55
    66/*
     
    1919
    2020/*0 implementation*/
    21 #ifndef __MWERKS__
    2221extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
    2322       double *rel, double wx);
     
    3433extern "C" void wGcd(int *x, int n);
    3534extern double wNsqr;
    36 #else
    37 #include "weight0.c"
    38 #endif /* __MWERKS__ */
    3935
    4036static void wDimensions(polyset s, int sl, int *lpol, int *npol, int *mons)
Note: See TracChangeset for help on using the changeset viewer.