Changeset 18060 for gsdl

Timestamp:

2008-12-04T12:15:04+13:00 (15 years ago)

Author:

mdewsnip

Message:

Transferred Windows-specific customisations from the old GDBM package in common-src\packages\windows\gdbm\gdbm.

Location:

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3

Files:

• gdbmreorg.c (modified) (1 diff)
• systems.h (modified) (3 diffs)
• windows/autoconf.h (modified) (2 diffs)

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmreorg.c

@@ -164 +164 @@
   /* Move the new file to old name. */
 
+#ifdef MSDOS
+  if (close (new_dbf->desc)
+      || unlink (dbf->name)
+      || rename (new_name, dbf->name)
+      || (new_dbf->desc = open (dbf->name, O_RDWR|O_BINARY)) < 0)
+#else /* not MSDOS */
   if (rename (new_name, dbf->name) != 0)
+#endif /* not MSDOS */
     {
       gdbm_errno = GDBM_REORGANIZE_FAILED;

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/systems.h

@@ -86 +86 @@
 #else
 
+#ifdef MSDOS
+#define MY_UNLOCK    0
+#define MY_READLOCK  1
+#define MY_WRITELOCK 2
+int my_locking(int fh, int lmode, long lockoffset, long nbytes);
+
+#define UNLOCK_FILE(dbf)    my_locking(dbf->desc,MY_UNLOCK,0,10)
+#define READLOCK_FILE(dbf)  lock_val=my_locking(dbf->desc,MY_READLOCK,0,10)
+#define WRITELOCK_FILE(dbf) lock_val=my_locking(dbf->desc,MY_WRITELOCK,0,10)
+
+#else
+
 /* Assume it is done like System V. */
 
@@ -113 +125 @@
     }
 #endif
+#endif
 
 /* Do we have bcopy?  */
@@ -125 +138 @@
 /* Do we have fsync? */
 #if !HAVE_FSYNC
+#ifdef MSDOS
+#define fsync(f)
+#else
 #define fsync(f) {sync(); sync();}
+#endif
 #endif
 

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/windows/autoconf.h

@@ -1 +1 @@
 /* autoconf.h.in.  Generated from configure.in by autoheader.  */
+
+#define MSDOS
 
 /* Define to 1 if you have the `bcopy' function. */
@@ -11 +13 @@
 
 /* Define to 1 if you have the `flock' function. */
-#define HAVE_FLOCK 1
+#undef HAVE_FLOCK
 
 /* Define to 1 if you have the `fsync' function. */