summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sprintf.c2
-rw-r--r--util.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 90315aea80..1ff46e4a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 25 03:56:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * util.c (freedtoa): made static to get rid of name clash. a patch by
+ Tadashi Saito <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36913]
+
+ * util.c (ruby_dtoa): added prefix, ditto.
+
Sat Oct 25 03:43:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (lambda): need to adjust lpar_beg for both of the parser and
diff --git a/sprintf.c b/sprintf.c
index 34152b1704..23671e6b93 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -1083,7 +1083,7 @@ fmt_setup(char *buf, int c, int flags, int width, int prec)
#undef vsnprintf
#undef snprintf
#define FLOATING_POINT 1
-#define BSD__dtoa dtoa
+#define BSD__dtoa ruby_dtoa
#include "missing/vsnprintf.c"
static int
diff --git a/util.c b/util.c
index ab993693b9..83245d7e0a 100644
--- a/util.c
+++ b/util.c
@@ -3092,7 +3092,7 @@ nrv_alloc(const char *s, char **rve, int n)
* when MULTIPLE_THREADS is not defined.
*/
-void
+static void
freedtoa(char *s)
{
Bigint *b = (Bigint *)((int *)s - 1);
@@ -3139,7 +3139,7 @@ freedtoa(char *s)
*/
char *
-dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
+ruby_dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
{
/* Arguments ndigits, decpt, sign are similar to those
of ecvt and fcvt; trailing zeros are suppressed from