summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--include/ruby/backward/rubysig.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 956de742ba..163f4047eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Feb 8 22:44:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/backward/rubysig.h (rb_thread_blocking_region_begin),
+ (rb_thread_blocking_region_end): marked as deprecated.
+
+ * include/ruby/backward/rubysig.h (TRAP_BEG): fix for C++. a
+ patch from Aman Gupta at [ruby-core:21934]
+
Sun Feb 8 21:47:50 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/extconf.rb: check struct cmsgcred.
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
index ae70903394..3952f7e85e 100644
--- a/include/ruby/backward/rubysig.h
+++ b/include/ruby/backward/rubysig.h
@@ -28,9 +28,9 @@ extern "C" {
#endif
struct rb_blocking_region_buffer;
-RUBY_EXTERN struct rb_blocking_region_buffer *rb_thread_blocking_region_begin(void);
-RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer *);
-#define TRAP_BEG do {void *__region = rb_thread_blocking_region_begin(void);
+DEPRECATED(RUBY_EXTERN struct rb_blocking_region_buffer *rb_thread_blocking_region_begin(void));
+DEPRECATED(RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer *));
+#define TRAP_BEG do {struct rb_blocking_region_buffer *__region = rb_thread_blocking_region_begin();
#define TRAP_END rb_thread_blocking_region_end(__region);} while (0)
#define RUBY_CRITICAL(statements) do {statements;} while (0)
#define DEFER_INTS (0)