diff options
| author | James Cox <imajes@php.net> | 2002-08-18 05:05:44 +0000 |
|---|---|---|
| committer | James Cox <imajes@php.net> | 2002-08-18 05:05:44 +0000 |
| commit | aad8f1473991fd684c95fbee47ce01a4bccd5997 (patch) | |
| tree | 04e39324fefbe7d1666fefb86fd18a583a233432 /ext/db | |
| parent | 4e3cb1d3c5cd6d5aa7526cc8ae60778e283e9568 (diff) | |
| download | php-git-aad8f1473991fd684c95fbee47ce01a4bccd5997.tar.gz | |
reverting to 1.73 for steph (sfox@php.net)
#is it just me or reverting using cvs just suck?
Diffstat (limited to 'ext/db')
| -rw-r--r-- | ext/db/db.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/db/db.c b/ext/db/db.c index e181c7da7d..fc9ec2d23c 100644 --- 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 |