[前][次][番号順一覧][スレッド一覧]

ruby-changes:10944

From: yugui <ko1@a...>
Date: Sun, 22 Feb 2009 18:48:47 +0900 (JST)
Subject: [ruby-changes:10944] Ruby:r22520 (ruby_1_9_1): merges r22123 from trunk into ruby_1_9_1.

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

  New Revision: 22520

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

  Log:
    merges r22123 from trunk into ruby_1_9_1.
    * include/ruby/backward/rubysig.h: extern "C" was missing.
      [ruby-core:21929]

  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 22519)
+++ ruby_1_9_1/include/ruby/backward/rubysig.h	(revision 22520)
@@ -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 @@
 #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
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22519)
+++ ruby_1_9_1/ChangeLog	(revision 22520)
@@ -1,3 +1,8 @@
+Sun Feb  8 19:05:24 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/backward/rubysig.h: extern "C" was missing.
+	  [ruby-core:21929]
+
 Sun Feb  8 18:34:43 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_s_binread): ensures file path.  [ruby-dev:37940]

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

[前][次][番号順一覧][スレッド一覧]