summaryrefslogtreecommitdiff
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
commit41de0174a325067153802cf6318feb8918065486 (patch)
tree7fc5442df1900d5162bb88016f760837fd963d21
parentaaac962c905c4ba9a0b2458c7f4d0100ebe89310 (diff)
* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@19891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb6
-rw-r--r--version.h6
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 242c5d4e88..94c107cdb9 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.
+
Wed Oct 22 00:33:15 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.c (test_core_03_notify): Fixed test failures
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 435f7dcd2a..f91f32a6cb 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -294,9 +294,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")
open(CONFTEST_C, "wb") do |cfile|
cfile.print src
end
diff --git a/version.h b/version.h
index 270fa5b26a..8434dc73d7 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-10-22"
+#define RUBY_RELEASE_DATE "2008-10-23"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081022
+#define RUBY_RELEASE_CODE 20081023
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];