aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/encoding.h14
-rw-r--r--include/ruby/vm.h14
3 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c1fc483b19..fbbdaeb4c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 25 13:26:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/vm.h, include/ruby/encoding.h: add external
+ linkage.
+
Tue May 25 01:46:49 2010 Yusuke Endoh <mame@tsg.ne.jp>
* vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index e614ea4a01..36f4a7cf12 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -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 @@ void rb_econv_binmode(rb_econv_t *ec);
#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 */
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
index 27b976dd85..ac8e599e90 100644
--- a/include/ruby/vm.h
+++ b/include/ruby/vm.h
@@ -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 @@ typedef struct rb_vm_struct ruby_vm_t;
/* 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 */