* sprintf.c, util.c (quorem, nrv_alloc, dtoa): enabled floating point

  support.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c44dae598..fcaab76c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 12 16:06:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c, util.c (quorem, nrv_alloc, dtoa): enabled floating point
+	  support.
+
 Tue Aug 12 15:52:45 2008  Narihiro Nakamura  <authorNari@gmail.com>
 
 	* gc.c (gc_profile_result): use sprintf.
diff --git a/sprintf.c b/sprintf.c
index 0fa93f241a..16a8f61b90 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -1034,6 +1034,8 @@ fmt_setup(char *buf, int c, int flags, int width, int prec)
 #endif
 #undef vsnprintf
 #undef snprintf
+#define FLOATING_POINT 1
+#define BSD__dtoa dtoa
 #include "missing/vsnprintf.c"
 
 static int
diff --git a/util.c b/util.c
index 9e9d95ef63..24841d6bef 100644
--- a/util.c
+++ b/util.c
@@ -1235,9 +1235,14 @@ extern double rnd_prod(double, double), rnd_quot(double, double);
 #endif
 #endif /* NO_LONG_LONG */
 
+#define MULTIPLE_THREADS 1
+
 #ifndef MULTIPLE_THREADS
 #define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
 #define FREE_DTOA_LOCK(n)	/*nothing*/
+#else
+#define ACQUIRE_DTOA_LOCK(n)	/*unused right now*/
+#define FREE_DTOA_LOCK(n)	/*unused right now*/
 #endif
 
 #define Kmax 15
@@ -3069,7 +3074,6 @@ ret:
     return sign ? -dval(rv) : dval(rv);
 }
 
-#if 0  /* unused right now */
 static int
 quorem(Bigint *b, Bigint *S)
 {
@@ -3180,13 +3184,11 @@ quorem(Bigint *b, Bigint *S)
     }
     return q;
 }
-#endif
 
 #ifndef MULTIPLE_THREADS
 static char *dtoa_result;
 #endif
 
-#if 0  /* unused right now */
 static char *
 rv_alloc(int i)
 {
@@ -3217,7 +3219,6 @@ nrv_alloc(const char *s, char **rve, int n)
         *rve = t;
     return rv;
 }
-#endif
 
 /* freedtoa(s) must be used to free values s returned by dtoa
  * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
@@ -3271,7 +3272,6 @@ freedtoa(char *s)
  *     calculation.
  */
 
-#if 0  /* unused right now */
 char *
 dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
 {
@@ -3941,7 +3941,6 @@ ret1:
         *rve = s;
     return s0;
 }
-#endif
 
 void
 ruby_each_words(const char *str, void (*func)(const char*, int, void*), void *arg)