diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-02-26 00:06:58 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-02-26 00:06:58 +0900 |
| commit | d747ea72c483446cb6d689cb888cf2488eb2a837 (patch) | |
| tree | 847f49d9bd4f59c629480c7a58e91d63bc21223e /include | |
| parent | 05d3b9de542f8b4335fb042a20f546d82be36022 (diff) | |
| parent | 61577e8d6b69efe8da23070abab0dfc7a00f5ee3 (diff) | |
| download | mruby-d747ea72c483446cb6d689cb888cf2488eb2a837.tar.gz mruby-d747ea72c483446cb6d689cb888cf2488eb2a837.zip | |
resolve conflict
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/numeric.h | 1 | ||||
| -rw-r--r-- | include/mruby/value.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h index d866d36d1..d0305160c 100644 --- a/include/mruby/numeric.h +++ b/include/mruby/numeric.h @@ -16,7 +16,6 @@ extern "C" { #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f)) mrb_value mrb_flo_to_fixnum(mrb_state *mrb, mrb_value val); -mrb_value mrb_flo_to_str(mrb_state *mrb, mrb_value flo); mrb_value mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, int base); diff --git a/include/mruby/value.h b/include/mruby/value.h index 13acd039e..a0f0c2ef9 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -59,6 +59,7 @@ typedef short mrb_sym; # include <float.h> # define isnan _isnan # define isinf(n) (!_finite(n) && !_isnan(n)) +# define signbit(n) (_copysign(1.0, (n)) < 0.0) # define strtoll _strtoi64 # define strtof (float)strtod # define PRId32 "I32d" |