diff options
| author | Karl Williamson <khw@cpan.org> | 2014-09-21 22:07:58 -0600 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2014-09-29 11:07:40 -0600 |
| commit | 9cba692be9578e72e0f03f616e61b7fa7a2fb79d (patch) | |
| tree | de70242b397ac2d31ff1b6e14b9e970d5ee82810 /op_reg_common.h | |
| parent | bb62883ea327df0c836748360635ed9394e2264c (diff) | |
| download | perl-9cba692be9578e72e0f03f616e61b7fa7a2fb79d.tar.gz | |
Suppress some Solaris warnings
We get an integer overflow message when we left shift a 1 into the
highest bit of a word. This changes the 1's into 1U's to indicate
unsigned. This is done for all the flag bits in the affected word, as
they could get reorderd by someone in the future, unintentionally
reintroducing this problem again.
Diffstat (limited to 'op_reg_common.h')
| -rw-r--r-- | op_reg_common.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/op_reg_common.h b/op_reg_common.h index ee404dcb95..9f7227d4e3 100644 --- a/op_reg_common.h +++ b/op_reg_common.h @@ -28,12 +28,12 @@ * INT_PAT_MODS in regexp.h for the reason contiguity is needed */ /* Make sure to update lib/re.pm when changing these! */ /* Make sure you keep the pure PMf_ versions below in sync */ -#define RXf_PMf_MULTILINE (1 << (RXf_PMf_STD_PMMOD_SHIFT+0)) /* /m */ -#define RXf_PMf_SINGLELINE (1 << (RXf_PMf_STD_PMMOD_SHIFT+1)) /* /s */ -#define RXf_PMf_FOLD (1 << (RXf_PMf_STD_PMMOD_SHIFT+2)) /* /i */ -#define RXf_PMf_EXTENDED (1 << (RXf_PMf_STD_PMMOD_SHIFT+3)) /* /x */ -#define RXf_PMf_EXTENDED_MORE (1 << (RXf_PMf_STD_PMMOD_SHIFT+4)) /* /xx */ -#define RXf_PMf_KEEPCOPY (1 << (RXf_PMf_STD_PMMOD_SHIFT+5)) /* /p */ +#define RXf_PMf_MULTILINE (1U << (RXf_PMf_STD_PMMOD_SHIFT+0)) /* /m */ +#define RXf_PMf_SINGLELINE (1U << (RXf_PMf_STD_PMMOD_SHIFT+1)) /* /s */ +#define RXf_PMf_FOLD (1U << (RXf_PMf_STD_PMMOD_SHIFT+2)) /* /i */ +#define RXf_PMf_EXTENDED (1U << (RXf_PMf_STD_PMMOD_SHIFT+3)) /* /x */ +#define RXf_PMf_EXTENDED_MORE (1U << (RXf_PMf_STD_PMMOD_SHIFT+4)) /* /xx */ +#define RXf_PMf_KEEPCOPY (1U << (RXf_PMf_STD_PMMOD_SHIFT+5)) /* /p */ /* The character set for the regex is stored in a field of more than one bit * using an enum, for reasons of compactness and to ensure that the options are @@ -88,7 +88,7 @@ get_regex_charset(const U32 flags) be used by regex engines to check whether they should set RXf_SKIPWHITE */ -#define RXf_PMf_SPLIT (1<<(RXf_PMf_STD_PMMOD_SHIFT+9)) +#define RXf_PMf_SPLIT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+9)) /* Next available bit after the above. Name begins with '_' so won't be * exported by B */ @@ -108,14 +108,14 @@ get_regex_charset(const U32 flags) /* These copies need to be numerical or ext/B/Makefile.PL won't think they are * constants */ -#define PMf_MULTILINE 1<<0 -#define PMf_SINGLELINE 1<<1 -#define PMf_FOLD 1<<2 -#define PMf_EXTENDED 1<<3 -#define PMf_EXTENDED_MORE 1<<4 -#define PMf_KEEPCOPY 1<<5 -#define PMf_CHARSET 7<<6 -#define PMf_SPLIT 1<<9 +#define PMf_MULTILINE 1U<<0 +#define PMf_SINGLELINE 1U<<1 +#define PMf_FOLD 1U<<2 +#define PMf_EXTENDED 1U<<3 +#define PMf_EXTENDED_MORE 1U<<4 +#define PMf_KEEPCOPY 1U<<5 +#define PMf_CHARSET 7U<<6 +#define PMf_SPLIT 1U<<9 #if PMf_MULTILINE != RXf_PMf_MULTILINE || PMf_SINGLELINE != RXf_PMf_SINGLELINE || PMf_FOLD != RXf_PMf_FOLD || PMf_EXTENDED != RXf_PMf_EXTENDED || PMf_EXTENDED_MORE != RXf_PMf_EXTENDED_MORE || PMf_KEEPCOPY != RXf_PMf_KEEPCOPY || PMf_SPLIT != RXf_PMf_SPLIT || PMf_CHARSET != RXf_PMf_CHARSET # error RXf_PMf defines are wrong |