yugui	2009-02-22 18:48:42 +0900 (Sun, 22 Feb 2009)

  New Revision: 22521

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22521

  Log:
    merges r22130 from trunk into ruby_1_9_1.
    * 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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/backward/rubysig.h

Index: ruby_1_9_1/include/ruby/backward/rubysig.h
===================================================================
--- ruby_1_9_1/include/ruby/backward/rubysig.h	(revision 22520)
+++ ruby_1_9_1/include/ruby/backward/rubysig.h	(revision 22521)
@@ -28,9 +28,9 @@
 #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)
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22520)
+++ ruby_1_9_1/ChangeLog	(revision 22521)
@@ -1,3 +1,11 @@
+Sun Feb  8 22:44:20 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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 19:05:24 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/backward/rubysig.h: extern "C" was missing.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/