summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-18 16:46:18 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-18 16:46:18 +0000
commit79c091d2caca568431be6f2a22737887a981116d (patch)
tree4eb2de7ddf71d703195956d657b9f3fc521131cf
parent405fa7b2f2091051dcc99a44819679ef1c61f5bd (diff)
downloadruby-79c091d2caca568431be6f2a22737887a981116d.tar.gz
ruby-79c091d2caca568431be6f2a22737887a981116d.tar.xz
ruby-79c091d2caca568431be6f2a22737887a981116d.zip
eban
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/sdbm/_sdbm.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index de1fe58a4..d2a0c661d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Aug 19 01:34:02 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
+ Win32 too.
+
+ * ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
+
Thu Aug 17 04:26:31 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index a07cc55f6..7a3147293 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -206,9 +206,7 @@ int mode;
* open the files in sequence, and stat the dirfile.
* If we fail anywhere, undo everything, return NULL.
*/
-#ifdef MSDOS
flags |= O_BINARY;
-#endif
if ((db->pagf = open(pagname, flags, mode)) > -1) {
if ((db->dirf = open(dirname, flags, mode)) > -1) {
/*
@@ -361,7 +359,7 @@ int need;
{
long newp;
char twin[PBLKSIZ];
-#ifdef MSDOS
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
char zer[PBLKSIZ];
long oldtail;
#endif
@@ -388,7 +386,7 @@ int need;
* here, as sdbm_store will do so, after it inserts the incoming pair.
*/
-#ifdef MSDOS
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
/*
* Fill hole with 0 if made it.
* (hole is NOT read as 0)