Changeset 3ff334 in git

Timestamp:

Apr 9, 1998, 1:47:13 PM (26 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e0bce7d14f8856bbd5f033cdbdad34575973fc57

Parents:

bf2cb0afbd85758686649544bac7e2f6dd6abc9f

Message:

generalisation to Metrowerks with WindowsNT


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

File:

• Singular/ndbm.cc (modified) (6 diffs)

Singular/ndbm.cc

@@ -5 +5 @@
 //**************************************************************************/
 //
-// $Id: ndbm.cc,v 1.8 1998-01-27 15:34:08 pohl Exp $
+// $Id: ndbm.cc,v 1.9 1998-04-09 11:47:13 pohl Exp $
 //
 //**************************************************************************/
@@ -30 +30 @@
 
 #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
 #ifdef macintosh
 #   include <stdlib.h>
@@ -36 +42 @@
 #   include <string.h>
 #   include <stat.h>
-#   define L_SET SEEK_SET
-#   define EPERM 1
-#   define ENOSPC 28
-#   define ENOMEM 23
-#   define bcopy(a,b,c) memmove(b,a,c)
-#else /* not macintosh */
+//#   include <stat.h>
+#else
+#   include <unix.h>
+#   include <ThreadLocalData.h>
+#endif
+#else
 #   include <sys/types.h>
 #   include <sys/stat.h>
@@ -50 +56 @@
 #   include <unistd.h>
 #   include <fcntl.h>
-#endif /* macintosh */
+#endif
 #ifndef HAVE_BCOPY
 #   define bcopy(a,b,c) memmove(b,a,c)
@@ -68 +74 @@
 static  int delitem(char buf[PBLKSIZ], int n);
 static  int additem(char buf[PBLKSIZ], datum item, datum item1);
+#if defined(__MWERKS__) && ! defined(macintosh)
+#define errno (_GetThreadLocalData()->errno)
+#else
 extern  int errno;
-
+#endif
 
 DBM *
@@ -96 +105 @@
   strcpy(db->dbm_pagbuf, file);
   strcat(db->dbm_pagbuf, ".pag");
-#ifdef macintosh
+#ifdef __MWERKS__
   db->dbm_pagf = open(db->dbm_pagbuf, flags);
-#else /* not macintosh */
+#else /* not __MWERKS__ */
   db->dbm_pagf = open(db->dbm_pagbuf, flags, mode);
-#endif /* macintosh */
+#endif /* __MWERKS__ */
   if (db->dbm_pagf < 0)
     goto bad;
   strcpy(db->dbm_pagbuf, file);
   strcat(db->dbm_pagbuf, ".dir");
-#ifdef macintosh
+#ifdef __MWERKS__
   db->dbm_dirf = open(db->dbm_pagbuf, flags);
-#else /* not macintosh */
+#else /* not __MWERKS__ */
   db->dbm_dirf = open(db->dbm_pagbuf, flags, mode);
-#endif /* macintosh */
+#endif /* __MWERKS__ */
   if (db->dbm_dirf < 0)
     goto bad1;