diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 23:55:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 23:55:49 +0000 |
| commit | 574cadc970c83ec9d1a4780fceb3929ac125173b (patch) | |
| tree | 9788e3348849d802891292722b7674ba2c8b3d12 | |
| parent | 8488b62d59dde799a3a38b9daaf62a4f06755327 (diff) | |
| download | ruby-574cadc970c83ec9d1a4780fceb3929ac125173b.tar.gz | |
* include/ruby/missing.h, include/ruby/ruby.h (namespace ruby):
get rid of name clash on C++.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Aug 8 08:55:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/missing.h, include/ruby/ruby.h (namespace ruby): + get rid of name clash on C++. + Sun Aug 8 07:47:29 2010 Tanaka Akira <akr@fsij.org> * lib/rbconfig/obsolete.rb: show the location which use Config. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index b53f54cd31..72fe91a9e8 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1431,7 +1431,7 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base); #define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();} -int ruby_snprintf(char *str, size_t n, char const *fmt, ...); +PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4); int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); #if defined __GNUC__ && __GNUC__ >= 4 |