summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-16 15:50:49 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-16 15:50:49 +0000
commit1fc61ca55fd736dbe63c37abde8239601ce3b2aa (patch)
tree17ef52b583dd03e0f5348336d0cd13744bdd3f77
parenta5b607c895adfb751c273e51fea101935d94e103 (diff)
mswin32 DLEXT2
O_BINARY git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog16
-rw-r--r--io.c2
-rw-r--r--version.h2
-rw-r--r--win32/config.h3
-rw-r--r--win32/config.status5
-rw-r--r--win32/ruby.def1
7 files changed, 23 insertions, 7 deletions
diff --git a/.cvsignore b/.cvsignore
index be335897bb0..8fcaffddb2e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,7 @@ newver.rb
ruby
miniruby
README.fat-patch
+configure
config.cache
config.h
config.log
diff --git a/ChangeLog b/ChangeLog
index bed749fbc59..7a3007bf7e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed May 17 00:45:57 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
+
+Wed May 17 00:40:15 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
+
+ * win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
+
+ * win32/config.status: ditto.
+
+ * win32/ruby.def: add symbol "rb_big_divmod".
+
Mon May 15 15:38:09 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.h: exported symbols should be for xmalloc etc. are now
@@ -15,7 +27,7 @@ Sun May 14 18:05:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* Makefile.in: missing/nt.c -> win32/win32.c
- * configure.in: bug fix; static linking on mingw32
+ * configure.in: bug fix; static linking on mingw32.
* cygwin/GNUmakefile.in: remove VPATH.
@@ -43,7 +55,7 @@ Sun May 14 00:54:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* file.c: should check S_IXGRP, S_ISGID, not NT.
- * io.c: should check _IOBIN, O_BINARY, not PLATFORMs.
+ * io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
Sat May 13 14:21:15 2000 Koji Arai <JCA02266@nifty.ne.jp>
diff --git a/io.c b/io.c
index cf244d1eb0e..2ffb1746759 100644
--- a/io.c
+++ b/io.c
@@ -1133,7 +1133,7 @@ VALUE
rb_io_binmode(io)
VALUE io;
{
-#if defined _IOBIN || defined O_BINARY
+#if defined(NT) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
OpenFile *fptr;
GetOpenFile(io, fptr);
diff --git a/version.h b/version.h
index e6a037c885f..975ae1f94b5 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.4"
-#define RUBY_RELEASE_DATE "2000-05-15"
+#define RUBY_RELEASE_DATE "2000-05-16"
#define RUBY_VERSION_CODE 154
#define RUBY_RELEASE_CODE 20000515
diff --git a/win32/config.h b/win32/config.h
index 32c9f4e43da..7dac0473231 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -38,7 +38,8 @@
#define RSHIFT(x,y) ((x)>>y)
#define FILE_COUNT _cnt
-#define DLEXT ".dll"
+#define DLEXT ".so"
+#define DLEXT2 ".dll"
#define RUBY_LIB "/usr/local/lib/ruby/1.5"
#define RUBY_SITE_LIB "/usr/local/lib/ruby/site_ruby"
#define RUBY_SITE_LIB2 "/usr/local/lib/ruby/site_ruby/1.5"
diff --git a/win32/config.status b/win32/config.status
index 4e039c03f2a..44659edb840 100644
--- a/win32/config.status
+++ b/win32/config.status
@@ -5,7 +5,7 @@ s%@CPPFLAGS@%%g
s%@CXXFLAGS@%%g
s%@FFLAGS@%%g
s%@DEFS@%
- -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_PLATFORM=\"i386-mswin32\" %g
+ -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FCNTL_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".so\" -DDLEXT2=\".dll\" -DRUBY_PLATFORM=\"i386-mswin32\" %g
s%@LDFLAGS@%%g
s%@LIBS@%user32.lib advapi32.lib wsock32.lib%g
s%@exec_prefix@%${prefix}%g
@@ -45,7 +45,8 @@ s%@DLDFLAGS@%%g
s%@STATIC@%%g
s%@CCDLFLAGS@%-DIMPORT%g
s%@LDSHARED@%cl -LD%g
-s%@DLEXT@%dll%g
+s%@DLEXT@%so%g
+s%@DLEXT2@%dll%g
s%@STRIP@%%g
s%@EXTSTATIC@%%g
s%@setup@%Setup%g
diff --git a/win32/ruby.def b/win32/ruby.def
index 1c0760308ee..0d8fab59706 100644
--- a/win32/ruby.def
+++ b/win32/ruby.def
@@ -186,6 +186,7 @@ EXPORTS
rb_big_plus
rb_big_minus
rb_big_mul
+ rb_big_divmod
rb_big_pow
rb_big_and
rb_big_or