diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-01-15 21:32:00 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-01-15 21:32:00 +0900 |
| commit | ff57c0278fe7c2b83231fa40e0284e6685a29ee7 (patch) | |
| tree | 4fdd4e1f9e6a35f7a39f1ed79813c6fac2230504 /include | |
| parent | 2742ded32fe18f88833d76b297f5c2170b6880c3 (diff) | |
| download | mruby-ff57c0278fe7c2b83231fa40e0284e6685a29ee7.tar.gz mruby-ff57c0278fe7c2b83231fa40e0284e6685a29ee7.zip | |
Remove broken `MRB_INT16` configuration option.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 9 | ||||
| -rw-r--r-- | include/mruby/boxing_word.h | 4 | ||||
| -rw-r--r-- | include/mruby/value.h | 12 |
3 files changed, 3 insertions, 22 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 0509f4ff9..3a574c7d2 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -40,19 +40,16 @@ /* no MRB_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */ //#define MRB_METHOD_T_STRUCT -/* add -DMRB_INT16 to use 16bit integer for mrb_int; conflict with MRB_INT32 and MRB_INT64 */ -//#define MRB_INT16 - -/* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT16 and MRB_INT64; +/* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT64; Default for 32-bit CPU mode. */ //#define MRB_INT32 -/* add -DMRB_INT64 to use 64bit integer for mrb_int; conflict with MRB_INT16 and MRB_INT32; +/* add -DMRB_INT64 to use 64bit integer for mrb_int; conflict with MRB_INT32; Default for 64-bit CPU mode. */ //#define MRB_INT64 /* if no specific integer type is chosen */ -#if !defined(MRB_INT16) && !defined(MRB_INT32) && !defined(MRB_INT64) +#if !defined(MRB_INT32) && !defined(MRB_INT64) # if defined(MRB_64BIT) && !defined(MRB_NAN_BOXING) /* Use 64bit integers on 64bit architecture (without MRB_NAN_BOXING) */ # define MRB_INT64 diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index 5249b565a..1388bb9f6 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -7,10 +7,6 @@ #ifndef MRUBY_BOXING_WORD_H #define MRUBY_BOXING_WORD_H -#if defined(MRB_INT16) -# error MRB_INT16 is too small for MRB_WORD_BOXING. -#endif - #if defined(MRB_INT64) && !defined(MRB_64BIT) #error MRB_INT64 cannot be used with MRB_WORD_BOXING in 32-bit mode. #endif diff --git a/include/mruby/value.h b/include/mruby/value.h index f403c11ac..232beb1dc 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -34,10 +34,6 @@ typedef uint32_t mrb_sym; typedef uint8_t mrb_bool; struct mrb_state; -#if defined(MRB_INT16) && defined(MRB_INT64) -# error "You can't define MRB_INT16 and MRB_INT64 at the same time." -#endif - #if defined _MSC_VER && _MSC_VER < 1800 # define PRIo64 "llo" # define PRId64 "lld" @@ -63,14 +59,6 @@ struct mrb_state; # define MRB_PRIo PRIo64 # define MRB_PRId PRId64 # define MRB_PRIx PRIx64 -#elif defined(MRB_INT16) - typedef int16_t mrb_int; -# define MRB_INT_BIT 16 -# define MRB_INT_MIN (INT16_MIN>>MRB_FIXNUM_SHIFT) -# define MRB_INT_MAX (INT16_MAX>>MRB_FIXNUM_SHIFT) -# define MRB_PRIo PRIo16 -# define MRB_PRId PRId16 -# define MRB_PRIx PRIx16 #else typedef int32_t mrb_int; # define MRB_INT_BIT 32 |