summaryrefslogtreecommitdiffhomepage
path: root/src/numeric.c
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-05-02 00:10:18 +0900
committerYukihiro Matsumoto <[email protected]>2012-05-02 00:10:18 +0900
commitf373169af0031b1f1b10062be1f11d1d047894df (patch)
tree6ed0fd9fe1a1e56915bb368bfb6cb668399f9dc6 /src/numeric.c
parentde67c321fec654c58be06c6b1b79084db286f9f9 (diff)
downloadmruby-f373169af0031b1f1b10062be1f11d1d047894df.tar.gz
mruby-f373169af0031b1f1b10062be1f11d1d047894df.zip
numeric.c: remove dependency to encoding.h
Diffstat (limited to 'src/numeric.c')
-rw-r--r--src/numeric.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/numeric.c b/src/numeric.c
index d5475bc8e..72cfb0c7e 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -16,10 +16,6 @@
#include <math.h>
#include <stdio.h>
-#ifdef INCLUDE_REGEXP
-#include "encoding.h"
-#endif
-
#if defined(__FreeBSD__) && __FreeBSD__ < 4
#include <floatingpoint.h>
#endif
@@ -32,20 +28,6 @@
#include <ieeefp.h>
#endif
-#ifndef mrb_usascii_str_new2
- #ifdef INCLUDE_REGEXP
- #define mrb_usascii_str_new2 mrb_usascii_str_new_cstr
- #else
- #define mrb_usascii_str_new2 mrb_str_new_cstr
- #endif
-#endif
-#ifndef mrb_usascii_str_new2
- #ifdef INCLUDE_REGEXP
- #else
- #define mrb_usascii_str_new mrb_str_new
- #endif
-#endif
-
/* use IEEE 64bit values if not defined */
#ifndef FLT_RADIX
#define FLT_RADIX 2
@@ -1050,7 +1032,7 @@ rb_fix2str(mrb_state *mrb, mrb_value x, int base)
mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid radix %d", base);
}
if (val == 0) {
- return mrb_usascii_str_new2(mrb, "0");
+ return mrb_str_new_cstr(mrb, "0");
}
if (val < 0) {
val = -val;
@@ -1064,7 +1046,7 @@ rb_fix2str(mrb_state *mrb, mrb_value x, int base)
*--b = '-';
}
- return mrb_usascii_str_new2(mrb, b);
+ return mrb_str_new_cstr(mrb, b);
}
#define SQRT_LONG_MAX ((SIGNED_VALUE)1<<((sizeof(intptr_t)*CHAR_BIT-1)/2))