diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-11-26 06:31:48 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-26 06:31:48 +0900 |
| commit | ec957ec5eee6c0a2874948c1b063e89d9fbd4eab (patch) | |
| tree | ef7f169b52202dba8e85ed580b464c859a2789ce /include | |
| parent | ff15a586a0571afdae5c2e10d19e843d32ad7f5f (diff) | |
| parent | 375c1ebc411ac2dd088f6897a2913c504fbc0852 (diff) | |
| download | mruby-ec957ec5eee6c0a2874948c1b063e89d9fbd4eab.tar.gz mruby-ec957ec5eee6c0a2874948c1b063e89d9fbd4eab.zip | |
Merge pull request #4838 from shuujii/rename-BITSIZE-to-BIT-and-BIT-to-BIT_POS-for-consistency
Rename `BITSIZE` to `BIT` and `BIT` to `BIT_POS` for consistency
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/boxing_word.h | 4 | ||||
| -rw-r--r-- | include/mruby/string.h | 4 | ||||
| -rw-r--r-- | include/mruby/value.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index d763ffaf8..73dffc5ef 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -43,10 +43,10 @@ enum mrb_special_consts { #define MRB_IMMEDIATE_MASK 0x07 #ifdef MRB_64BIT -#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT) +#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT) #define MRB_SYMBOL_MAX UINT32_MAX #else -#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT - MRB_SYMBOL_SHIFT) +#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT - MRB_SYMBOL_SHIFT) #define MRB_SYMBOL_MAX (UINT32_MAX >> MRB_SYMBOL_SHIFT) #endif diff --git a/include/mruby/string.h b/include/mruby/string.h index e5a046073..80b8fbaf8 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -115,8 +115,8 @@ MRB_API mrb_int mrb_str_strlen(mrb_state*, struct RString*); #define MRB_STR_POOL 16 /* status flags from here */ #define MRB_STR_ASCII 32 #define MRB_STR_EMBED_LEN_SHIFT 6 -#define MRB_STR_EMBED_LEN_BITSIZE 5 -#define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BITSIZE) - 1) << MRB_STR_EMBED_LEN_SHIFT) +#define MRB_STR_EMBED_LEN_BIT 5 +#define MRB_STR_EMBED_LEN_MASK (((1 << MRB_STR_EMBED_LEN_BIT) - 1) << MRB_STR_EMBED_LEN_SHIFT) #define MRB_STR_TYPE_MASK (MRB_STR_POOL - 1) diff --git a/include/mruby/value.h b/include/mruby/value.h index 5a909a5cf..4c1ea098f 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -169,9 +169,9 @@ typedef void mrb_value; #include "boxing_no.h" #endif -#if !defined(MRB_SYMBOL_BITSIZE) -#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT) -#define MRB_SYMBOL_MAX UINT32_MAX +#if !defined(MRB_SYMBOL_BIT) +#define MRB_SYMBOL_BIT (sizeof(mrb_sym) * CHAR_BIT) +#define MRB_SYMBOL_MAX UINT32_MAX #endif #if INTPTR_MAX < MRB_INT_MAX |