mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
Solaris compiler. [ruby-core:08114] * time.c (time_to_s): use +0900 style timezone string for local time. [ruby-dev:29143] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b6151bcebe
commit
b0283eed43
3 changed files with 15 additions and 12 deletions
|
@ -1,6 +1,9 @@
|
|||
Thu Jul 27 09:02:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* time.c (time_to_s): generate RFC822 style date string.
|
||||
* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
|
||||
Solaris compiler. [ruby-core:08114]
|
||||
|
||||
* time.c (time_to_s): use +0900 style timezone string for local time.
|
||||
[ruby-dev:29143]
|
||||
|
||||
Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
|
|
@ -17,6 +17,15 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
|
||||
*/
|
||||
#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
|
||||
# undef RFILE
|
||||
#endif
|
||||
#include <ruby.h>
|
||||
#include <rubyio.h>
|
||||
|
||||
/*
|
||||
* Check the OpenSSL version
|
||||
* The only supported are:
|
||||
|
@ -60,15 +69,6 @@ extern "C" {
|
|||
# undef OpenFile
|
||||
#endif
|
||||
|
||||
/*
|
||||
* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
|
||||
*/
|
||||
#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
|
||||
# undef RFILE
|
||||
#endif
|
||||
#include <ruby.h>
|
||||
#include <rubyio.h>
|
||||
|
||||
/*
|
||||
* Common Module
|
||||
*/
|
||||
|
|
2
time.c
2
time.c
|
@ -1219,7 +1219,7 @@ time_to_s(VALUE time)
|
|||
sign = '-';
|
||||
off = -off;
|
||||
}
|
||||
sprintf(buf2, "%%a %%b %%d %%Y %%H:%%M:%%S %c%02d%02d",
|
||||
sprintf(buf2, "%%a %%b %%d %%H:%%M:%%S %c%02d%02d %%Y",
|
||||
sign, off/3600, off%3600/60);
|
||||
len = strftime(buf, 128, buf2, &tobj->tm);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue