From a0ee3ba2d08acb423a1cbc4a5ae862bd40c4b914 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 21 Apr 2010 15:31:58 -0700 Subject: avoid direct require of "rack" to quiet warnings This quiets down warnings when used with RubyGems loaders such as Isolate and Bundler where the HTTP server already loaded Rack. --- ext/clogger_ext/clogger.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'ext') diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c index 93c609d..453ff48 100644 --- a/ext/clogger_ext/clogger.c +++ b/ext/clogger_ext/clogger.c @@ -776,21 +776,10 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig) #define CONST_GLOBAL_STR(val) CONST_GLOBAL_STR2(val, #val) -static void init_rack_utils_header_hash(void) -{ - VALUE mRack, mUtils; -#if 0 - extra double quotes below are to disable rdoc (and so is avoiding comments) - let me know if there is a better way... -#endif - rb_require("rack"); - mRack = rb_define_module("Rack"""); - mUtils = rb_define_module_under(mRack, "Utils"""); - cHeaderHash = rb_define_class_under(mUtils, "HeaderHash""", rb_cHash); -} - void Init_clogger_ext(void) { + VALUE tmp; + ltlt_id = rb_intern("<<"); call_id = rb_intern("call"); each_id = rb_intern("each"); @@ -826,5 +815,8 @@ void Init_clogger_ext(void) CONST_GLOBAL_STR2(space, " "); CONST_GLOBAL_STR2(question_mark, "?"); CONST_GLOBAL_STR2(rack_request_cookie_hash, "rack.request.cookie_hash"); - init_rack_utils_header_hash(); + + tmp = rb_const_get(rb_cObject, rb_intern("Rack")); + tmp = rb_const_get(tmp, rb_intern("Utils")); + cHeaderHash = rb_const_get(tmp, rb_intern("HeaderHash")); } -- cgit v1.2.3-24-ge0c7