cvs: php4 /ext/db db.c
| From: | James Cox | Date: | Sun, 18 Aug 2002 05:05:44 +0000 |
| Subject: | cvs: php4 /ext/db db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13448@lists.php.net to get a copy of this message | ||
imajes Sun Aug 18 01:05:44 2002 EDT
Modified files:
/php4/ext/db db.c
Log:
reverting to 1.73 for steph (sfox@php.net)
#is it just me or reverting using cvs just suck?
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.74 php4/ext/db/db.c:1.75
--- php4/ext/db/db.c:1.74 Tue Aug 13 00:10:31 2002
+++ php4/ext/db/db.c Sun Aug 18 01:05:44 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.74 2002/08/13 04:10:31 kalowsky Exp $ */
+/* $Id: db.c,v 1.75 2002/08/18 05:05:44 imajes Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -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 @@
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