diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 18 | ||||
| -rw-r--r-- | time.c | 2 |
3 files changed, 15 insertions, 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> diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 5ab93bf39e..0366901a35 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -18,6 +18,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: * OpenSSL >= 0.9.7 @@ -61,15 +70,6 @@ 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> - -/* * Common Module */ extern VALUE mOSSL; @@ -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); } |