From 70b3d78229bf74c44a035fc55a3cf36fb222362c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 22 Feb 2009 09:48:34 +0000
Subject: [PATCH] merges r22123 from trunk into ruby_1_9_1. *
 include/ruby/backward/rubysig.h: extern "C" was missing.   [ruby-core:21929]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       |  5 +++++
 include/ruby/backward/rubysig.h | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f7aec738c6..afc1cadf4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  8 19:05:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward/rubysig.h: extern "C" was missing.
+	  [ruby-core:21929]
+
 Sun Feb  8 18:34:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_s_binread): ensures file path.  [ruby-dev:37940]
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
index 6a0cf0ef9c..ae70903394 100644
--- a/include/ruby/backward/rubysig.h
+++ b/include/ruby/backward/rubysig.h
@@ -20,6 +20,13 @@
 #define RUBYSIG_H
 #include "ruby/ruby.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#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 *);
@@ -30,4 +37,12 @@ RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer
 #define ENABLE_INTS (1)
 #define ALLOW_INTS do {CHECK_INTS;} while (0)
 #define CHECK_INTS rb_thread_check_ints()
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif