diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 22:19:17 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 22:19:17 +0000 |
| commit | d82dd262d076c4b43fdc95c9c648badf3dec5692 (patch) | |
| tree | 94a3ce0d81406c0843ce7f751c64060d16fb6bad /include | |
| parent | 3fabdc8e405e7145ec9d499f7fb08caca1ed8dbe (diff) | |
* include/ruby/subst.h (snprintf): redefinition moved from ruby.h.
(vsnprintf): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/ruby.h | 4 | ||||
| -rw-r--r-- | include/ruby/subst.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 1b0b111d5e..b53f54cd31 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1433,10 +1433,6 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base); int ruby_snprintf(char *str, size_t n, char const *fmt, ...); int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#undef snprintf -#undef vsnprintf -#define snprintf ruby_snprintf -#define vsnprintf ruby_vsnprintf #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop diff --git a/include/ruby/subst.h b/include/ruby/subst.h index 2287baeafe..6c01b25900 100644 --- a/include/ruby/subst.h +++ b/include/ruby/subst.h @@ -1,6 +1,11 @@ #ifndef RUBY_SUBST_H #define RUBY_SUBST_H 1 +#undef snprintf +#undef vsnprintf +#define snprintf ruby_snprintf +#define vsnprintf ruby_vsnprintf + #ifdef BROKEN_CLOSE #undef getpeername #define getpeername ruby_getpeername |