2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c880c8d6c8..f605eaf10b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 10 15:00:11 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_mark): remove NULL check
+	  (time_memsize): ditto
+	  (time_free): remove, use RUBY_TYPED_DEFAULT_FREE instead
+	  [Feature #10219]
+
 Wed Sep 10 14:14:57 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* common.mk (encs enc trans libencs libenc libtrans): force to run
diff --git a/time.c b/time.c
index 6248a74442..17ba4aaf53 100644
--- a/time.c
+++ b/time.c
@@ -1782,7 +1782,6 @@ static void
 time_mark(void *ptr)
 {
     struct time_object *tobj = ptr;
-    if (!tobj) return;
     if (!FIXWV_P(tobj->timew))
         rb_gc_mark(w2v(tobj->timew));
     rb_gc_mark(tobj->vtm.year);
@@ -1790,21 +1789,15 @@ time_mark(void *ptr)
     rb_gc_mark(tobj->vtm.utc_offset);
 }
 
-static void
-time_free(void *tobj)
-{
-    if (tobj) xfree(tobj);
-}
-
 static size_t
 time_memsize(const void *tobj)
 {
-    return tobj ? sizeof(struct time_object) : 0;
+    return sizeof(struct time_object);
 }
 
 static const rb_data_type_t time_data_type = {
     "time",
-    {time_mark, time_free, time_memsize,},
+    {time_mark, RUBY_TYPED_DEFAULT_FREE, time_memsize,},
     NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };