diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-21 07:20:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-21 07:20:23 +0000 |
commit | e93b8f1c892672a06bd6861859373e7bec49c3f6 (patch) | |
tree | 75443f1c65204e8b871d2a46a9b1371eec994b91 | |
parent | 6d9e4a20e107805da30dc6d4e4e80bebcb46bdb5 (diff) |
* dln.h, ruby.h, util.h: enable prototypes in C++.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | dln.h | 9 | ||||
-rw-r--r-- | ruby.h | 15 | ||||
-rw-r--r-- | util.h | 8 |
4 files changed, 33 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Dec 21 16:18:17 2001 Nobuyoshi Nakada <[email protected]> + + * dln.h, ruby.h, util.h: enable prototypes in C++. + Fri Dec 21 03:15:52 2001 Nobuyoshi Nakada <[email protected]> * eval.c (rb_mod_define_method): must not convert Method to Proc. @@ -13,6 +13,15 @@ #ifndef DLN_H #define DLN_H +#ifdef __cplusplus +# ifndef HAVE_PROTOTYPES +# define HAVE_PROTOTYPES 1 +# endif +# ifndef HAVE_STDARG_PROTOTYPES +# define HAVE_STDARG_PROTOTYPES 1 +# endif +#endif + #undef _ #ifdef HAVE_PROTOTYPES # define _(args) args @@ -52,6 +52,15 @@ extern "C" { # define volatile #endif +#ifdef __cplusplus +# ifndef HAVE_PROTOTYPES +# define HAVE_PROTOTYPES 1 +# endif +# ifndef HAVE_STDARG_PROTOTYPES +# define HAVE_STDARG_PROTOTYPES 1 +# endif +#endif + #undef _ #ifdef HAVE_PROTOTYPES # define _(args) args @@ -582,7 +591,7 @@ EXTERN VALUE rb_eLoadError; EXTERN VALUE rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo; static inline VALUE -#if defined(__cplusplus) +#if defined(HAVE_PROTOTYPES) rb_class_of(VALUE obj) #else rb_class_of(obj) @@ -599,7 +608,7 @@ rb_class_of(obj) } static inline int -#if defined(__cplusplus) +#if defined(HAVE_PROTOTYPES) rb_type(VALUE obj) #else rb_type(obj) @@ -616,7 +625,7 @@ rb_type(obj) } static inline int -#if defined(__cplusplus) +#if defined(HAVE_PROTOTYPES) rb_special_const_p(VALUE obj) #else rb_special_const_p(obj) @@ -14,6 +14,14 @@ #define UTIL_H #ifndef _ +#ifdef __cplusplus +# ifndef HAVE_PROTOTYPES +# define HAVE_PROTOTYPES 1 +# endif +# ifndef HAVE_STDARG_PROTOTYPES +# define HAVE_STDARG_PROTOTYPES 1 +# endif +#endif #ifdef HAVE_PROTOTYPES # define _(args) args #else |