diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-26 02:29:53 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-26 02:29:53 -0700 |
| commit | 478f5c6b70c1eff501d2f8bd2cc1b1914280f85c (patch) | |
| tree | 24eb776a5228f0ba9df1ff63705b70817b8d9320 /include | |
| parent | 5c5101809b561e7f1b822b016c7b51150cb519a8 (diff) | |
| parent | d4476109c4376ca7eccc9f6cb3a10e68ec623d78 (diff) | |
| download | mruby-478f5c6b70c1eff501d2f8bd2cc1b1914280f85c.tar.gz mruby-478f5c6b70c1eff501d2f8bd2cc1b1914280f85c.zip | |
Merge pull request #1215 from monaka/pr-avoid-define-MRB_INT16-and-MRB_INT64-at-the-same-time
Avoid to define MRB_INT16 and MRB_INT64 at the same time
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index d8dca7d61..80aad11e7 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -14,7 +14,10 @@ /* add -DMRB_USE_FLOAT to use float instead of double for floating point numbers */ //#define MRB_USE_FLOAT -/* add -DMRB_INT64 to use 64bit integer for mrb_int */ +/* add -DMRB_INT16 to use 16bit integer for mrb_int; conflict with MRB_INT64 */ +//#define MRB_INT16 + +/* add -DMRB_INT64 to use 64bit integer for mrb_int; conflict with MRB_INT16 */ //#define MRB_INT64 /* represent mrb_value in boxed double; conflict with MRB_USE_FLOAT */ @@ -71,6 +74,10 @@ # define str_to_mrb_float(buf) strtod(buf, NULL) #endif +#if defined(MRB_INT16) && defined(MRB_INT64) +# error You can't define MRB_INT16 and MRB_INT64 at the same time. +#endif + #if defined(MRB_INT64) # ifdef MRB_NAN_BOXING # error Cannot use NaN boxing when mrb_int is 64bit |