1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up

Browse Source 
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:
matz 2006-07-27 07:48:04 +00:00
parent b6151bcebe
commit b0283eed43
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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] [ruby-dev:29143]
Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>

18
ext/openssl/ossl.h
View File

@ -17,6 +17,15 @@
extern "C" { extern "C" {
#endif #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 * Check the OpenSSL version
* The only supported are: * The only supported are:
@ -60,15 +69,6 @@ extern "C" {
# undef OpenFile # undef OpenFile
#endif #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 * Common Module
*/ */

2
time.c
View File

@ -1219,7 +1219,7 @@ time_to_s(VALUE time)
sign = '-'; sign = '-';
off = -off; 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); sign, off/3600, off%3600/60);
len = strftime(buf, 128, buf2, &tobj->tm); len = strftime(buf, 128, buf2, &tobj->tm);
} }