summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-22 16:24:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-22 16:24:58 +0000
commitf916c6a67fd09e125f352bd83b425e37f7863839 (patch)
tree9ae2c96ae43a281494f9e8ffa907579381fce510
parent4ee659516d842d6ac443eab8007eec65ebca5e32 (diff)
downloadruby-f916c6a67fd09e125f352bd83b425e37f7863839.tar.gz
ruby-f916c6a67fd09e125f352bd83b425e37f7863839.tar.xz
ruby-f916c6a67fd09e125f352bd83b425e37f7863839.zip
* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 553570dde..2db990b97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 23 01:24:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_tmpsrc): get rid of side effects.
+
Thu Oct 23 00:10:01 2008 Koichi Sasada <ko1@atdot.net>
* cont.c: separate data structure between rb_fiber_t and
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index d95d74807..615b89842 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -323,9 +323,11 @@ EOM
end
def create_tmpsrc(src)
+ src = "#{COMMON_HEADERS}\n#{src}"
src = yield(src) if block_given?
- src[0, 0] = COMMON_HEADERS + "\n"
- src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
+ src.gsub!(/[ \t]+$/, '')
+ src.gsub!(/\A\n+|^\n+$/, '')
+ src.sub!(/[^\n]\z/, "\\&\n")
count = 0
begin
open(CONFTEST_C, "wb") do |cfile|