yajl-ruby 0.6.5 → 0.6.6

data/.gitignore

@@ -1,5 +1,6 @@
 Makefile
 benchmark/subjects/contacts.*
+*.rbc
 *.o
 *.dylib
 *.bundle

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.6 (December 1st, 2009)
+* Brought over some optimizations from Macruby's use of some yajl-ruby codez
+* Yajl::HttpStream now supports being killed for long-running requests, thanks to Filipe Giusti <filipegiusti@gmail.com>
+
 ## 0.6.5 (November 13th, 2009)
 * optimize symbol creation while symbolize_keys is turned on
 * fix for 32bit integer conversion into ruby

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 6
-:patch: 5
+:patch: 6
 :major: 0

data/benchmark/encode.rb

@@ -3,9 +3,15 @@ require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
 require 'stringio'
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+end
 # Can't use ActiveSuport::JSON.encode with the JSON gem loaded
-# require 'activesupport'
+# begin
+#   require 'activesupport'
+# rescue LoadError
+# end
 
 filename = ARGV[0] || 'benchmark/subjects/ohai.json'
 json = File.new(filename, 'r')
@@ -29,18 +35,22 @@ Benchmark.bmbm { |x|
       output = string_encoder.encode(hash)
     }
   }
-  x.report {
-    puts "JSON.generate"
-    times.times {
-      JSON.generate(hash)
+  if defined?(JSON)
+    x.report {
+      puts "JSON.generate"
+      times.times {
+        JSON.generate(hash)
+      }
     }
-  }
+  end
   # Can't use ActiveSuport::JSON.encode with the JSON gem loaded
   #
-  # x.report {
-  #   puts "ActiveSupport::JSON.encode"
-  #   times.times {
-  #     ActiveSupport::JSON.encode(hash)
+  # if defined?(ActiveSupport::JSON)
+  #   x.report {
+  #     puts "ActiveSupport::JSON.encode"
+  #     times.times {
+  #       ActiveSupport::JSON.encode(hash)
+  #     }
   #   }
-  # }
+  # end
 }

data/benchmark/encode_json_and_marshal.rb

@@ -3,7 +3,10 @@ require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
 require 'stringio'
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+end
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
 filename = 'benchmark/subjects/ohai.json'
@@ -20,12 +23,14 @@ Benchmark.bmbm { |x|
       encoder.encode(hash, StringIO.new)
     }
   }
-  x.report {
-    puts "JSON's #to_json"
-    times.times {
-      JSON.generate(hash)
+  if defined?(JSON)
+    x.report {
+      puts "JSON's #to_json"
+      times.times {
+        JSON.generate(hash)
+      }
     }
-  }
+  end
   x.report {
     puts "Marshal.dump"
     times.times {

data/benchmark/encode_json_and_yaml.rb

@@ -2,7 +2,10 @@
 require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+end
 require 'yaml'
 
 # JSON Section
@@ -21,12 +24,14 @@ Benchmark.bmbm { |x|
       encoder.encode(hash, StringIO.new)
     }
   }
-  x.report {
-    puts "JSON's #to_json"
-    times.times {
-      JSON.generate(hash)
+  if defined?(JSON)
+    x.report {
+      puts "JSON's #to_json"
+      times.times {
+        JSON.generate(hash)
+      }
     }
-  }
+  end
 }
 
 # YAML Section

data/benchmark/parse.rb

@@ -2,8 +2,14 @@
 require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
-require 'json'
-require 'activesupport'
+begin
+  require 'json'
+rescue LoadError
+end
+begin
+  require 'activesupport'
+rescue LoadError
+end
 
 filename = ARGV[0] || 'benchmark/subjects/twitter_search.json'
 json = File.new(filename, 'r')
@@ -29,19 +35,23 @@ Benchmark.bmbm { |x|
       string_parser.parse(json.read)
     }
   }
-  x.report {
-    puts "JSON.parse"
-    times.times {
-      json.rewind
-      JSON.parse(json.read, :max_nesting => false)
+  if defined?(JSON)
+    x.report {
+      puts "JSON.parse"
+      times.times {
+        json.rewind
+        JSON.parse(json.read, :max_nesting => false)
+      }
     }
-  }
-  x.report {
-    puts "ActiveSupport::JSON.decode"
-    times.times {
-      json.rewind
-      ActiveSupport::JSON.decode(json.read)
+  end
+  if defined?(ActiveSupport::JSON)
+    x.report {
+      puts "ActiveSupport::JSON.decode"
+      times.times {
+        json.rewind
+        ActiveSupport::JSON.decode(json.read)
+      }
     }
-  }
+  end
 }
 json.close

data/benchmark/parse_json_and_marshal.rb

@@ -2,7 +2,10 @@
 require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+end
 
 # JSON section
 filename = 'benchmark/subjects/ohai.json'
@@ -24,13 +27,15 @@ Benchmark.bmbm { |x|
       hash = yajl.parse(json)
     }
   }
-  x.report {
-    puts "JSON.parse"
-    times.times {
-      json.rewind
-      JSON.parse(json.read, :max_nesting => false)
+  if defined?(JSON)
+    x.report {
+      puts "JSON.parse"
+      times.times {
+        json.rewind
+        JSON.parse(json.read, :max_nesting => false)
+      }
     }
-  }
+  end
   x.report {
     puts "Marshal.load"
     times.times {

data/benchmark/parse_json_and_yaml.rb

@@ -2,7 +2,10 @@
 require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
-require 'json'
+begin
+  require 'json'
+rescue LoadError
+end
 require 'yaml'
 
 # JSON section
@@ -21,13 +24,15 @@ Benchmark.bmbm { |x|
       parser.parse(json)
     }
   }
-  x.report {
-    puts "JSON.parse"
-    times.times {
-      json.rewind
-      JSON.parse(json.read, :max_nesting => false)
+  if defined?(JSON)
+    x.report {
+      puts "JSON.parse"
+      times.times {
+        json.rewind
+        JSON.parse(json.read, :max_nesting => false)
+      }
     }
-  }
+  end
 }
 json.close
 

data/benchmark/parse_stream.rb

@@ -2,8 +2,14 @@
 require 'rubygems'
 require 'benchmark'
 require 'yajl_ext'
-require 'json'
-require 'activesupport'
+begin
+  require 'json'
+rescue LoadError
+end
+begin
+  require 'activesupport'
+rescue LoadError
+end
 
 filename = 'benchmark/subjects/twitter_stream.json'
 json = File.new(filename, 'r')
@@ -20,23 +26,27 @@ Benchmark.bmbm { |x|
       parser.parse(json)
     }
   }
-  x.report {
-    puts "JSON.parse"
-    times.times {
-      json.rewind
-      while chunk = json.gets
-        JSON.parse(chunk, :max_nesting => false)
-      end
+  if defined?(JSON)
+    x.report {
+      puts "JSON.parse"
+      times.times {
+        json.rewind
+        while chunk = json.gets
+          JSON.parse(chunk, :max_nesting => false)
+        end
+      }
     }
-  }
-  x.report {
-    puts "ActiveSupport::JSON.decode"
-    times.times {
-      json.rewind
-      while chunk = json.gets
-        ActiveSupport::JSON.decode(chunk)
-      end
+  end
+  if defined?(ActiveSupport::JSON)
+    x.report {
+      puts "ActiveSupport::JSON.decode"
+      times.times {
+        json.rewind
+        while chunk = json.gets
+          ActiveSupport::JSON.decode(chunk)
+        end
+      }
     }
-  }
+  end
 }
 json.close

data/ext/yajl_ext.c

@@ -1,8 +1,31 @@
+/*
+ * Copyright (c) 2008-2009 Brian Lopez - http://github.com/brianmario
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 #include "yajl_ext.h"
 
 /* Helpers for building objects */
 inline void yajl_check_and_fire_callback(void * ctx) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     
     /* No need to do any of this if the callback isn't even setup */
@@ -23,7 +46,7 @@ inline void yajl_check_and_fire_callback(void * ctx) {
 }
 
 inline void yajl_set_static_value(void * ctx, VALUE val) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     VALUE lastEntry, hash;
     int len;
     
@@ -61,23 +84,28 @@ inline void yajl_set_static_value(void * ctx, VALUE val) {
 }
 
 static void yajl_encoder_wrapper_free(void * wrapper) {
-    struct yajl_encoder_wrapper * w = wrapper;
-    yajl_gen_free(w->encoder);
-    free(w);
+    yajl_encoder_wrapper * w = wrapper;
+    if (w) {
+        yajl_gen_free(w->encoder);
+        free(w);
+    }
 }
 
 static void yajl_encoder_wrapper_mark(void * wrapper) {
-    struct yajl_encoder_wrapper * w = wrapper;
-    rb_gc_mark(w->on_progress_callback);
-    rb_gc_mark(w->terminator);
+    yajl_encoder_wrapper * w = wrapper;
+    if (w) {
+        rb_gc_mark(w->on_progress_callback);
+        rb_gc_mark(w->terminator);
+    }
 }
 
 void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
     VALUE str, outBuff, otherObj;
-    struct yajl_encoder_wrapper * w = wrapper;
+    yajl_encoder_wrapper * w = wrapper;
     yajl_gen_status status;
     int idx = 0;
     const unsigned char * buffer;
+    const char * cptr;
     unsigned int len;
     int quote_strings = 1;
     
@@ -133,13 +161,15 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
         case T_FLOAT:
         case T_BIGNUM:
             str = rb_funcall(obj, intern_to_s, 0);
-            if (strcmp(RSTRING_PTR(str), "NaN") == 0 || strcmp(RSTRING_PTR(str), "Infinity") == 0 || strcmp(RSTRING_PTR(str), "-Infinity") == 0) {
-                rb_raise(cEncodeError, "'%s' is an invalid number", RSTRING_PTR(str));
+            cptr = RSTRING_PTR(str);
+            if (strcmp(cptr, "NaN") == 0 || strcmp(cptr, "Infinity") == 0 || strcmp(cptr, "-Infinity") == 0) {
+                rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
             }
-            status = yajl_gen_number(w->encoder, RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str));
+            status = yajl_gen_number(w->encoder, cptr, (unsigned int)strlen(cptr));
             break;
         case T_STRING:
-            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(obj), (unsigned int)RSTRING_LEN(obj), 1);
+            cptr = RSTRING_PTR(obj);
+            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr), 1);
             break;
         default:
             if (rb_respond_to(obj, intern_to_json)) {
@@ -148,21 +178,26 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             } else {
                 str = rb_funcall(obj, intern_to_s, 0);
             }
-            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str), quote_strings);
+            cptr = RSTRING_PTR(str);
+            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr), quote_strings);
             break;
     }
 }
 
 void yajl_parser_wrapper_free(void * wrapper) {
-    struct yajl_parser_wrapper * w = wrapper;
-    yajl_free(w->parser);
-    free(w);
+    yajl_parser_wrapper * w = wrapper;
+    if (w) {
+        yajl_free(w->parser);
+        free(w);
+    }
 }
 
 void yajl_parser_wrapper_mark(void * wrapper) {
-    struct yajl_parser_wrapper * w = wrapper;
-    rb_gc_mark(w->builderStack);
-    rb_gc_mark(w->parse_complete_callback);
+    yajl_parser_wrapper * w = wrapper;
+    if (w) {
+        rb_gc_mark(w->builderStack);
+        rb_gc_mark(w->parse_complete_callback);
+    }
 }
 
 void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle parser) {
@@ -191,19 +226,16 @@ static int yajl_found_boolean(void * ctx, int boolean) {
 }
 
 static int yajl_found_number(void * ctx, const char * numberVal, unsigned int numberLen) {
-    char * cSubString = ALLOC_N(char, numberLen+1);
-    if (cSubString) {
-        memcpy(cSubString, numberVal, numberLen);
+    char buf[numberLen+1];
+    memcpy(buf, numberVal, numberLen);
+    buf[numberLen] = 0;
+
+    if (strchr(buf, '.') || strchr(buf, 'e') || strchr(buf, 'E')) {
+        yajl_set_static_value(ctx, rb_float_new(strtod(buf, NULL)));
     }
-    cSubString[numberLen] = '\0';
-    
-    if (strchr(cSubString, '.') != NULL || strchr(cSubString, 'e') != NULL || strchr(cSubString, 'E') != NULL) {
-        yajl_set_static_value(ctx, rb_float_new(rb_cstr_to_dbl(cSubString, 10)));
-    } else {
-        yajl_set_static_value(ctx, rb_cstr2inum(cSubString, 10));
+    else {
+        yajl_set_static_value(ctx, rb_cstr2inum(buf, 10));
     }
-    yajl_check_and_fire_callback(ctx);
-    free(cSubString);
     return 1;
 }
 
@@ -214,18 +246,15 @@ static int yajl_found_string(void * ctx, const unsigned char * stringVal, unsign
 }
 
 static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     VALUE keyStr;
 
     if (wrapper->symbolizeKeys) {
-        char * cSubString = ALLOC_N(char, stringLen+1);
-        if (cSubString) {
-            memcpy(cSubString, stringVal, stringLen);
-        }
-        cSubString[stringLen] = '\0';
-        yajl_set_static_value(ctx, ID2SYM(rb_intern(cSubString)));
-        free(cSubString);
+        char buf[stringLen+1];
+        memcpy(buf, stringVal, stringLen);
+        buf[stringLen] = 0;
+        yajl_set_static_value(ctx, ID2SYM(rb_intern(buf)));
     } else {
         keyStr = rb_str_new((const char *)stringVal, stringLen);
         yajl_set_static_value(ctx, keyStr);
@@ -235,7 +264,7 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
 }
 
 static int yajl_found_start_hash(void * ctx) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     wrapper->nestedHashLevel++;
     yajl_set_static_value(ctx, rb_hash_new());
@@ -243,7 +272,7 @@ static int yajl_found_start_hash(void * ctx) {
 }
 
 static int yajl_found_end_hash(void * ctx) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     wrapper->nestedHashLevel--;
     if (RARRAY_LEN(wrapper->builderStack) > 1) {
@@ -254,7 +283,7 @@ static int yajl_found_end_hash(void * ctx) {
 }
 
 static int yajl_found_start_array(void * ctx) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     wrapper->nestedArrayLevel++;
     yajl_set_static_value(ctx, rb_ary_new());
@@ -262,7 +291,7 @@ static int yajl_found_start_array(void * ctx) {
 }
 
 static int yajl_found_end_array(void * ctx) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     wrapper->nestedArrayLevel--;
     if (RARRAY_LEN(wrapper->builderStack) > 1) {
@@ -295,7 +324,7 @@ static int yajl_found_end_array(void * ctx) {
  * :check_utf8 will validate UTF8 characters found in the JSON stream, defaults to true.
  */
 static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     yajl_parser_config cfg;
     VALUE opts, obj;
     int allowComments = 1, checkUTF8 = 1, symbolizeKeys = 0;
@@ -316,7 +345,7 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
     }
     cfg = (yajl_parser_config){allowComments, checkUTF8};
     
-    obj = Data_Make_Struct(klass, struct yajl_parser_wrapper, yajl_parser_wrapper_mark, yajl_parser_wrapper_free, wrapper);
+    obj = Data_Make_Struct(klass, yajl_parser_wrapper, yajl_parser_wrapper_mark, yajl_parser_wrapper_free, wrapper);
     wrapper->parser = yajl_alloc(&callbacks, &cfg, NULL, (void *)obj);
     wrapper->nestedArrayLevel = 0;
     wrapper->nestedHashLevel = 0;
@@ -366,8 +395,9 @@ static VALUE rb_yajl_parser_init(int argc, VALUE * argv, VALUE self) {
 */
 static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
     yajl_status stat;
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     VALUE rbufsize, input, blk;
+    const char * cptr;
     
     GetParser(self, wrapper);
     
@@ -383,12 +413,14 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
     }
     
     if (TYPE(input) == T_STRING) {
-        yajl_parse_chunk((const unsigned char *)RSTRING_PTR(input), RSTRING_LEN(input), wrapper->parser);
+        cptr = RSTRING_PTR(input);
+        yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
     } else if (rb_respond_to(input, intern_eof)) {
         VALUE parsed = rb_str_new2("");
         while (rb_funcall(input, intern_eof, 0) != Qtrue) {
             rb_funcall(input, intern_io_read, 2, rbufsize, parsed);
-            yajl_parse_chunk((const unsigned char *)RSTRING_PTR(parsed), RSTRING_LEN(parsed), wrapper->parser);
+            cptr = RSTRING_PTR(parsed);
+            yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
         }
     } else {
         rb_raise(cParseError, "input must be a string or IO");
@@ -417,7 +449,7 @@ static VALUE rb_yajl_parser_parse(int argc, VALUE * argv, VALUE self) {
  * parsed off the stream as they're found.
  */
 static VALUE rb_yajl_parser_parse_chunk(VALUE self, VALUE chunk) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     
     GetParser(self, wrapper);
     if (NIL_P(chunk)) {
@@ -426,7 +458,8 @@ static VALUE rb_yajl_parser_parse_chunk(VALUE self, VALUE chunk) {
     }
     
     if (wrapper->parse_complete_callback != Qnil) {
-        yajl_parse_chunk((const unsigned char *)RSTRING_PTR(chunk), RSTRING_LEN(chunk), wrapper->parser);
+        const char * cptr = RSTRING_PTR(chunk);
+        yajl_parse_chunk((const unsigned char*)cptr, (unsigned int)strlen(cptr), wrapper->parser);
     } else {
         rb_raise(cParseError, "The on_parse_complete callback isn't setup, parsing useless.");
     }
@@ -444,7 +477,7 @@ static VALUE rb_yajl_parser_parse_chunk(VALUE self, VALUE chunk) {
  * It will pass a single parameter, the ruby object built from the last parsed JSON object
  */
 static VALUE rb_yajl_parser_set_complete_cb(VALUE self, VALUE callback) {
-    struct yajl_parser_wrapper * wrapper;
+    yajl_parser_wrapper * wrapper;
     GetParser(self, wrapper);
     wrapper->parse_complete_callback = callback;
     return Qnil;
@@ -474,7 +507,7 @@ static VALUE rb_yajl_parser_set_complete_cb(VALUE self, VALUE callback) {
   * the encoder will still pass it - I hope that makes sense ;).
  */
 static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
-    struct yajl_encoder_wrapper * wrapper;
+    yajl_encoder_wrapper * wrapper;
     yajl_gen_config cfg;
     VALUE opts, obj, indent;
     const char * indentString = "  ";
@@ -495,7 +528,7 @@ static VALUE rb_yajl_encoder_new(int argc, VALUE * argv, VALUE klass) {
     }
     cfg = (yajl_gen_config){beautify, indentString};
     
-    obj = Data_Make_Struct(klass, struct yajl_encoder_wrapper, yajl_encoder_wrapper_mark, yajl_encoder_wrapper_free, wrapper);
+    obj = Data_Make_Struct(klass, yajl_encoder_wrapper, yajl_encoder_wrapper_mark, yajl_encoder_wrapper_free, wrapper);
     wrapper->encoder = yajl_gen_alloc(&cfg, NULL);
     wrapper->on_progress_callback = Qnil;
     if (opts != Qnil && rb_funcall(opts, intern_has_key, 1, sym_terminator) == Qtrue) {
@@ -543,7 +576,7 @@ static VALUE rb_yajl_encoder_init(int argc, VALUE * argv, VALUE self) {
  * ruby objects to encode. This is how streaming is accomplished.
  */
 static VALUE rb_yajl_encoder_encode(int argc, VALUE * argv, VALUE self) {
-    struct yajl_encoder_wrapper * wrapper;
+    yajl_encoder_wrapper * wrapper;
     const unsigned char * buffer;
     unsigned int len;
     VALUE obj, io, blk, outBuff;
@@ -596,7 +629,7 @@ static VALUE rb_yajl_encoder_encode(int argc, VALUE * argv, VALUE self) {
  * For example, encoding a large object that would normally result in 24288 bytes of data will result in 3 calls to this callback (assuming the 8kb default encode buffer).
  */
 static VALUE rb_yajl_encoder_set_progress_cb(VALUE self, VALUE callback) {
-    struct yajl_encoder_wrapper * wrapper;
+    yajl_encoder_wrapper * wrapper;
     GetEncoder(self, wrapper);
     wrapper->on_progress_callback = callback;
     return Qnil;