diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-26 17:59:06 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-26 17:59:06 +0000 |
| commit | 0ce7a947d5f547d9f81d336aee99c507d94b965c (patch) | |
| tree | dc6951e6fa1aa8b8848c64f19d3464c7e5aa327c /regint.h | |
| parent | 5c2169d4c7af399a6cf50c9d6139191e571229bb (diff) | |
merge revision(s) 39547: [Backport #7972] [Backport #7974]
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
v5.13.3 [Bug#7972] [Bug#7974]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regint.h')
| -rw-r--r-- | regint.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -390,7 +390,7 @@ typedef unsigned int BitStatusType; /* bitset */ #define BITS_PER_BYTE 8 #define SINGLE_BYTE_SIZE (1 << BITS_PER_BYTE) -#define BITS_IN_ROOM ((int)sizeof(Bits) * BITS_PER_BYTE) +#define BITS_IN_ROOM ((int )sizeof(Bits) * BITS_PER_BYTE) #define BITSET_SIZE (SINGLE_BYTE_SIZE / BITS_IN_ROOM) #ifdef PLATFORM_UNALIGNED_WORD_ACCESS @@ -405,11 +405,11 @@ typedef Bits* BitSetRef; #define BITSET_CLEAR(bs) do {\ int i;\ - for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; } \ + for (i = 0; i < BITSET_SIZE; i++) { (bs)[i] = 0; } \ } while (0) -#define BS_ROOM(bs,pos) (bs)[(int)(pos) / BITS_IN_ROOM] -#define BS_BIT(pos) (1 << ((int)(pos) % BITS_IN_ROOM)) +#define BS_ROOM(bs,pos) (bs)[(int )(pos) / BITS_IN_ROOM] +#define BS_BIT(pos) (1 << ((int )(pos) % BITS_IN_ROOM)) #define BITSET_AT(bs, pos) (BS_ROOM(bs,pos) & BS_BIT(pos)) #define BITSET_SET_BIT(bs, pos) BS_ROOM(bs,pos) |= BS_BIT(pos) @@ -457,7 +457,7 @@ typedef struct _BBuf { #define BBUF_WRITE1(buf,pos,byte) do{\ int used = (pos) + 1;\ if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\ - (buf)->p[(pos)] = (byte);\ + (buf)->p[(pos)] = (UChar )(byte);\ if ((buf)->used < (unsigned int )used) (buf)->used = used;\ } while (0) |