nobu	2010-05-25 13:26:50 +0900 (Tue, 25 May 2010)

  New Revision: 28007

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

  Log:
    * include/ruby/vm.h, include/ruby/encoding.h: add external
      linkage.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/encoding.h
    branches/ruby_1_9_2/include/ruby/vm.h
    trunk/ChangeLog
    trunk/include/ruby/encoding.h
    trunk/include/ruby/vm.h

Index: include/ruby/vm.h
===================================================================
--- include/ruby/vm.h	(revision 28006)
+++ include/ruby/vm.h	(revision 28007)
@@ -12,6 +12,13 @@
 #ifndef RUBY_VM_H
 #define RUBY_VM_H 1
 
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
 /* Place holder.
  *
  * We will prepare VM creation/control APIs on 1.9.2 or later.
@@ -25,4 +32,11 @@
 /* core API */
 int ruby_vm_destruct(ruby_vm_t *vm);
 
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif /* RUBY_VM_H */
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 28006)
+++ include/ruby/encoding.h	(revision 28007)
@@ -12,6 +12,13 @@
 #ifndef RUBY_ENCODING_H
 #define RUBY_ENCODING_H 1
 
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
 #include <stdarg.h>
 #include "ruby/oniguruma.h"
 
@@ -303,4 +310,11 @@
 #define ECONV_AFTER_OUTPUT                      0x00020000
 /* end of flags for rb_econv_convert */
 
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif /* RUBY_ENCODING_H */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28006)
+++ ChangeLog	(revision 28007)
@@ -1,3 +1,8 @@
+Tue May 25 13:26:49 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/vm.h, include/ruby/encoding.h: add external
+	  linkage.
+
 Tue May 25 01:46:49 2010  Yusuke Endoh  <mame@t...>
 
 	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
Index: ruby_1_9_2/include/ruby/vm.h
===================================================================
--- ruby_1_9_2/include/ruby/vm.h	(revision 28006)
+++ ruby_1_9_2/include/ruby/vm.h	(revision 28007)
@@ -12,6 +12,13 @@
 #ifndef RUBY_VM_H
 #define RUBY_VM_H 1
 
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
 /* Place holder.
  *
  * We will prepare VM creation/control APIs on 1.9.2 or later.
@@ -25,4 +32,11 @@
 /* core API */
 int ruby_vm_destruct(ruby_vm_t *vm);
 
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif /* RUBY_VM_H */
Index: ruby_1_9_2/include/ruby/encoding.h
===================================================================
--- ruby_1_9_2/include/ruby/encoding.h	(revision 28006)
+++ ruby_1_9_2/include/ruby/encoding.h	(revision 28007)
@@ -12,6 +12,13 @@
 #ifndef RUBY_ENCODING_H
 #define RUBY_ENCODING_H 1
 
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
 #include <stdarg.h>
 #include "ruby/oniguruma.h"
 
@@ -303,4 +310,11 @@
 #define ECONV_AFTER_OUTPUT                      0x00020000
 /* end of flags for rb_econv_convert */
 
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif /* RUBY_ENCODING_H */
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28006)
+++ ruby_1_9_2/ChangeLog	(revision 28007)
@@ -1,3 +1,8 @@
+Tue May 25 13:26:49 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/vm.h, include/ruby/encoding.h: add external
+	  linkage.
+
 Tue May 25 01:46:49 2010  Yusuke Endoh  <mame@t...>
 
 	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI

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