Skip to content

Commit

Permalink
mswin32 DLEXT2
Browse files Browse the repository at this point in the history
O_BINARY


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
eban committed May 16, 2000
1 parent a5b607c commit 1fc61ca
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 7 deletions.
1 change: 1 addition & 0 deletions .cvsignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ newver.rb
ruby
miniruby
README.fat-patch
configure
config.cache
config.h
config.log
Expand Down
16 changes: 14 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
Wed May 17 00:45:57 2000 WATANABE Hirofumi <[email protected]>

* io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...

Wed May 17 00:40:15 2000 Katsuyuki Komatsu <[email protected]>

* 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 <[email protected]>

* ruby.h: exported symbols should be for xmalloc etc. are now
Expand All @@ -15,7 +27,7 @@ Sun May 14 18:05:59 2000 WATANABE Hirofumi <[email protected]>

* 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.

Expand Down Expand Up @@ -43,7 +55,7 @@ Sun May 14 00:54:43 2000 WATANABE Hirofumi <[email protected]>

* 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 <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion win32/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions win32/config.status
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions win32/ruby.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1fc61ca

Please sign in to comment.