aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h4
-rw-r--r--include/ruby/subst.h5
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 27f784eeb6..1fc1e55c0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 8 07:18:22 2010 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/subst.h (snprintf): redefinition moved from ruby.h.
+ (vsnprintf): ditto.
+
Sun Aug 8 00:41:42 2010 Tanaka Akira <akr@fsij.org>
* include/ruby/subst.h: new file for substitute standard functions..
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