summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regint.h6
-rw-r--r--version.h6
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7facfac0e0..fe7b7ce27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 19 10:17:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * regint.h (CHECK_INTERRUPT_IN_MATCH_AT): add interrupt check
+ during match. [ruby-talk:295002]
+
Tue Mar 18 16:24:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (literal_concat_gen): bail out at different encoding.
diff --git a/regint.h b/regint.h
index c88010381a..3d1ce7b76a 100644
--- a/regint.h
+++ b/regint.h
@@ -110,10 +110,10 @@
#define xfree free
#endif
-#define CHECK_INTERRUPT_IN_MATCH_AT
-
#ifdef RUBY
+#include "vm_core.h"
+#define CHECK_INTERRUPT_IN_MATCH_AT RUBY_VM_CHECK_INTS()
#define onig_st_init_table st_init_table
#define onig_st_init_table_with_size st_init_table_with_size
#define onig_st_init_numtable st_init_numtable
@@ -156,6 +156,8 @@
/* */
#define onig_st_is_member st_is_member
+#define CHECK_INTERRUPT_IN_MATCH_AT
+
#endif
#define STATE_CHECK_STRING_THRESHOLD_LEN 7
diff --git a/version.h b/version.h
index ae9cc04841..9c2f4f70d1 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-18"
+#define RUBY_RELEASE_DATE "2008-03-19"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080318
+#define RUBY_RELEASE_CODE 20080319
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];