summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5ee7a8d81..1d5cdb566a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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