archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 19486:

Browse source 
* win32/win32.c (subtruct): check tv_sec.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-04-08 09:59:58 +00:00
parent c5258c5dca
commit e1a304ff66
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Apr 8 18:59:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (subtruct): check tv_sec.
Thu Apr 2 16:06:17 2009 URABE Shyouhei <shyouhei@ruby-lang.org> Thu Apr 2 16:06:17 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/rss/test_atom.rb (RSS::TestAtomCore::assert_atom_content_inline_other_base64_to_s): * test/rss/test_atom.rb (RSS::TestAtomCore::assert_atom_content_inline_other_base64_to_s):

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2009-04-02" #define RUBY_RELEASE_DATE "2009-04-08"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090402 #define RUBY_RELEASE_CODE 20090408
#define RUBY_PATCHLEVEL 159 #define RUBY_PATCHLEVEL 160
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 2 #define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];

3
win32/win32.c
View file

@ -2196,6 +2196,9 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
static inline int static inline int
subtract(struct timeval *rest, const struct timeval *wait) subtract(struct timeval *rest, const struct timeval *wait)
{ {
if (rest->tv_sec < wait->tv_sec) {
return 0;
}
while (rest->tv_usec < wait->tv_usec) { while (rest->tv_usec < wait->tv_usec) {
if (rest->tv_sec <= wait->tv_sec) { if (rest->tv_sec <= wait->tv_sec) {
return 0; return 0;