From 0f07b537cef715eb48169675d5582a06f4277b40 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 24 Nov 2008 11:39:51 -0800
Subject: Require builder before fast_xs so we don't tickle its over-eager
 String#to_xs collision check

---
 activesupport/lib/active_support/vendor.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index 23ceeb1359..4202c287d0 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -6,6 +6,7 @@ begin
 rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
 end
+require 'builder'
 
 begin
   gem 'xml-simple', '~> 1.0.11'
@@ -31,4 +32,4 @@ end
 # rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1"
   require 'i18n'
-# end
\ No newline at end of file
+# end
-- 
cgit v1.2.3