diff --git a/ChangeLog b/ChangeLog index e1f9d10e7e..9339bbcbe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 26 05:27:34 2011 NARUSE, Yui + + * ext/date/lib/date/format.rb (DateTime#strftime): removed because + date_core defines it. + Fri Mar 25 21:59:45 2011 Tadayoshi Funaba * ext/date/date_core.c: should not force cast with macros. @@ -20,7 +25,7 @@ Fri Mar 25 19:39:40 2011 Ben Walton Use LOG_PID instead of LOG_PERROR in Syslog.open test - LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms + LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms that don't define it. Solaris 9 and 10 are examples of this. Use LOG_PID instead. diff --git a/ext/date/lib/date/format.rb b/ext/date/lib/date/format.rb index 56dfdcfabe..d38525b7e3 100644 --- a/ext/date/lib/date/format.rb +++ b/ext/date/lib/date/format.rb @@ -1073,10 +1073,6 @@ end class DateTime < Date - def strftime(fmt='%FT%T%:z') - super(fmt) - end - def self._strptime(str, fmt='%FT%T%z') super(str, fmt) end