aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--encoding.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b4951e39bb..714865ecf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 4 08:57:37 2014 Eric Wong <e@80x24.org>
+
+ * encoding.c (enc_memsize): remove unnecessary function
+ [ruby-core:65304]
+
Mon Nov 3 18:09:39 2014 Tanaka Akira <akr@fsij.org>
* test/openssl/utils.rb: The default of :ignore_listener_error is
diff --git a/encoding.c b/encoding.c
index e3a0978253..a7301a1b2c 100644
--- a/encoding.c
+++ b/encoding.c
@@ -71,15 +71,9 @@ void rb_enc_init(void);
static int load_encoding(const char *name);
-static size_t
-enc_memsize(const void *p)
-{
- return 0;
-}
-
static const rb_data_type_t encoding_data_type = {
"encoding",
- {0, 0, enc_memsize,},
+ {0, 0, 0,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
};