From ae38279aac4a96da8f06ca78b6cc6d30cebc0bdd Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Thu, 2 Jun 2005 18:29:51 +0000 Subject: [PATCH] Fixed to work on Ruby 1.8.{0,1} again. --- ChangeLog | 5 ++++- ext/ext.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 108ca42..8495ac9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -- -$Id: ChangeLog 51 2005-05-31 21:15:03Z tilman $ +$Id: ChangeLog 52 2005-06-02 18:29:51Z tilman $ ++ +2005-06-02 Tilman Sauerbeck (tilman at code-monkey de) + * ext/ext.c: Fixed to work on Ruby 1.8.{0,1} again + 2005-05-31 Tilman Sauerbeck (tilman at code-monkey de) * ext/ext.c: Optimized Object#to_eet slightly diff --git a/ext/ext.c b/ext/ext.c index 61ceb4f..4fd5e57 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 51 2005-05-31 21:15:03Z tilman $ + * $Id: ext.c 52 2005-06-02 18:29:51Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -48,7 +48,7 @@ static VALUE c_close (VALUE self); static VALUE cStream, cChunk, eEetError, eNameError, ePropError, sym_lossy, sym_level, sym_quality; -static ID id_include, id_serialize, id_push, +static ID id_include, id_serialize, id_push, id_keys, id_to_eet_chunks, id_to_eet_name, id_to_eet_properties, id_tag, id_data; @@ -554,6 +554,10 @@ static VALUE c_to_eet (VALUE self) { VALUE props, name, stream, chunk, args[2]; +#ifndef HAVE_RB_HASH_FOREACH + struct RArray *keys; + long i; +#endif props = rb_funcall (self, id_to_eet_properties, 0); @@ -570,7 +574,16 @@ c_to_eet (VALUE self) stream = rb_class_new_instance (0, NULL, cStream); +#ifdef HAVE_RB_HASH_FOREACH rb_hash_foreach (props, for_each_prop, stream); +#else + keys = RARRAY (rb_funcall (props, id_keys, 0)); + + for (i = 0; i < keys->len; i++) + for_each_prop (keys->ptr[i], + rb_hash_aref (props, keys->ptr[i]), + stream); +#endif args[0] = name; args[1] = rb_funcall (stream, id_serialize, 0); @@ -619,6 +632,7 @@ Init_eet_ext () id_include = rb_intern ("include?"); id_serialize = rb_intern ("serialize"); id_push = rb_intern ("push"); + id_keys = rb_intern ("keys"); id_to_eet_chunks = rb_intern ("to_eet_chunks"); id_to_eet_name = rb_intern ("to_eet_name"); id_to_eet_properties = rb_intern ("to_eet_properties"); -- 2.30.2