Changeset 48ce9a in git

Timestamp:

Jul 27, 2005, 11:59:27 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

58ac0853e446e66c1775b4ecbc279060079c866a

Parents:

dcb1b7234585e33f2aa5d87adfdbc154c0cd591e

Message:

*hannes: removed MWERKS and macintosh (Mac 9) code


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

Location:

Singular

Files:

• cntrlc.cc (modified) (3 diffs)
• iplib.cc (modified) (2 diffs)
• misc.cc (modified) (2 diffs)
• mod2.h.in (modified) (2 diffs)
• mpsr_Tok.cc (modified) (3 diffs)
• ndbm.cc (modified) (3 diffs)
• tesths.cc (modified) (2 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.48 2005-05-06 14:21:19 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.49 2005-07-27 09:59:26 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -495 +495 @@
 #endif /* !MSDOS */
 
-//#ifdef macintosh
-//#include <Types.h>
-//#include <Events.h>
-//#include <OSEvents.h>
-//#include <CursorCtl.h>
-//
-///*3
-//* macintosh only:
-//* side effect of ^C is to insert EOF at the end of the current
-//* input selection. We must drain input, reach this EOF, then clear it
-//*/
-//static void flush_intr(void)
-//{
-//  int c;
-//
-//  while ((c=getchar())!=EOF);
-//  clearerr(stdin);
-//}
-//
-///*3
-//* macintosh only:
-//* spin beach ball in MPW, allows MPW-tool to go to the background
-//* so you can use the finder and interrupts
-//*/
-//static void beachball(void)
-//{
-//  Show_Cursor(HIDDEN_CURSOR);
-//  SpinCursor(10);
-//}
-//#endif
-
 #ifndef MSDOS
 //void test_int()
 //{
-//#ifndef macintosh
 //  if (siCntrlc!=0)
 //  {
@@ -535 +503 @@
 //    siCntrlc = FALSE;
 //    si_set_signal(SIGINT ,sigint_handler);
-////#ifdef macintosh
-////    flush_intr();
-////#endif
 //    iiDebug();
 //    si_echo = saveecho;
 //  }
-//#endif
 //}
 #endif /* !MSDOS */

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.115 2005-05-23 15:28:15 Singular Exp $ */
+/* $Id: iplib.cc,v 1.116 2005-07-27 09:59:26 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -1150 +1150 @@
 //#if defined(WINNT)
 //#  define  FS_SEP '\\'
-//#elif defined(macintosh)
-//#  define FS_SEP ','
 //#else
 //#  define FS_SEP '/'

Singular/misc.cc

@@ -95 +95 @@
 *
 *#ifndef MSDOS
-*#ifndef macintosh
 *#include <sys/times.h>
 *#include <sys/resource.h>
@@ -106 +105 @@
 *  sleep(10);
 *}
-*#else
-*void very_nice(){}
-*#endif
 *#else
 *void very_nice(){}

Singular/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.111 2005-07-26 17:06:58 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.112 2005-07-27 09:59:27 Singular Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -216 +216 @@
 /* Undefine to disable real time measurments  */
 #ifdef HAVE_GETTIMEOFDAY
-#if ! defined(__MWERKS__) && ! defined(MSDOS)
+#if ! defined(MSDOS)
 #define HAVE_RTIMER
 #else

Singular/mpsr_Tok.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Tok.cc,v 1.30 2001-08-27 14:47:17 Singular Exp $ */
+/* $Id: mpsr_Tok.cc,v 1.31 2005-07-27 09:59:27 Singular Exp $ */
 
 /***************************************************************
@@ -580 +580 @@
 
 // simply touch mpsr_Tok.inc so that Make does not get confused
-#if !defined(macintosh) && !defined(HPUX_9)
+#if !defined(HPUX_9)
 extern "C" int system(char *);
 #else
@@ -588 +588 @@
 void mpsr_ttGen()
 {
-#ifndef macintosh
   system("touch mpsr_Tok.inc");
-#else
-  // simulate touch on a macintosh
-  FILE *fd = fopen("mpsr_Tok.inc", "w");
-  close(fd);
+}
 #endif
-}
-#endif
 
 #endif // HAVE_MPSR

Singular/ndbm.cc

@@ -5 +5 @@
 //**************************************************************************/
 //
-// $Id: ndbm.cc,v 1.15 2005-07-26 17:06:58 Singular Exp $
+// $Id: ndbm.cc,v 1.16 2005-07-27 09:59:27 Singular Exp $
 //
 //**************************************************************************/
@@ -33 +33 @@
 
 #include <stdio.h>
-#ifdef __MWERKS__
-#   define bcopy(a,b,c) memmove(b,a,c)
-#   define EPERM 1
-#   define ENOMEM 23
-#   define ENOSPC 28
-#   define L_SET SEEK_SET
-#else
-#   include <sys/types.h>
-#   include <sys/stat.h>
-#   include <sys/file.h>
-#   include <errno.h>
-#   include <stdlib.h>
-#   include <string.h>
-#   include <unistd.h>
-#   include <fcntl.h>
-#endif
+/* alternative:
+* #   define EPERM 1
+* #   define ENOMEM 23
+* #   define ENOSPC 28
+* #   define L_SET SEEK_SET
+*/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 #ifndef HAVE_BCOPY
 #   define bcopy(a,b,c) memmove(b,a,c)
@@ -78 +76 @@
     return ((DBM *)0);
   }
-#ifdef macintosh
-  // It seems that the compile has some problems to commit the flags properly
-  // O_RDWR | O_CREAT = 0x102 change to 0x200. We don't know why.
-  // setting flags to O_RDWR | O_CREAT solved our problem. :-(
-  flags = O_RDWR | O_CREAT;
-#endif /* macintosh */
 #ifdef MSDOS
   // default mode of open is ascii, we need binary mode.

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.99 2005-07-26 17:06:58 Singular Exp $ */
+/* $Id: tesths.cc,v 1.100 2005-07-27 09:59:27 Singular Exp $ */
 
 /*
@@ -150 +150 @@
     sdb_flags = 0;
 #endif
-#ifdef __MWERKS__
-    memcpy(stderr,stdout,sizeof(FILE));
-#else
     dup2(1,2);
-#endif
+    /* alternative:
+    *    memcpy(stderr,stdout,sizeof(FILE));
+    */
   }
   slStandardInit();