reverting to 1.73 for steph (sfox@php.net)

#is it just me or reverting using cvs just suck?

diff --git a/ext/db/db.c b/ext/db/db.c
index e181c7da7db321cd4cbbe7f1d124db876d9d344b..fc9ec2d23c64a8a613a724382aac69b190bd2882 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -38,11 +38,15 @@
 #include <unistd.h>
 #endif
 
+#ifdef PHP_31
+#include "os/nt/flock.h"
+#else
 #ifdef PHP_WIN32
 #include "win32/flock.h"
 #else
 #include <sys/file.h>
 #endif
+#endif
 
 #if HAVE_FCNTL_H
 #include <fcntl.h>
@@ -626,12 +630,7 @@ char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC)
        DBM_TYPE dbf;
 
        key_datum.dptr = key;
-#ifdef PHP_WIN32
-       key_datum.dsize = strlen(key+1);
-#else
        key_datum.dsize = strlen(key);
-#endif
-
 #if GDBM_FIX
        key_datum.dsize++;
 #endif