RE: [PHP-CVS] com php-src: SIZEOF_SIZE_T doesn't exist on AIX and POWER8 (ppc64le), keep using SIZEOF_LONG: ext/mbstring/oniguruma/src/regint.h
| From: | Anatol Belski | Date: | Thu, 13 Jul 2017 15:10:22 +0000 |
| Subject: | RE: [PHP-CVS] com php-src: SIZEOF_SIZE_T doesn't exist on AIX and POWER8 (ppc64le), keep using SIZEOF_LONG: ext/mbstring/oniguruma/src/regint.h | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-98542@lists.php.net to get a copy of this message | ||
> -----Original Message-----
> From: Lior Kaplan [mailto:kaplan@php.net]
> Sent: Thursday, July 13, 2017 5:06 PM
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] com php-src: SIZEOF_SIZE_T doesn't exist on AIX and
> POWER8 (ppc64le), keep using SIZEOF_LONG:
> ext/mbstring/oniguruma/src/regint.h
>
> Commit: c2c60fcac75d74a5c6864af2723301c72cb73925
> Author: Lior Kaplan <kaplanlior@gmail.com> Thu, 13 Jul 2017 18:05:47
> +0300
> Parents: 5fb2abd6b01eb6da9c868132982aacadfa793d23
> Branches: master
>
> Link: http://git.php.net/?p=php-
> src.git;a=commitdiff;h=c2c60fcac75d74a5c6864af2723301c72cb73925
>
> Log:
> SIZEOF_SIZE_T doesn't exist on AIX and POWER8 (ppc64le), keep using
> SIZEOF_LONG
>
> Changed paths:
> M ext/mbstring/oniguruma/src/regint.h
>
>
> Diff:
> diff --git a/ext/mbstring/oniguruma/src/regint.h
> b/ext/mbstring/oniguruma/src/regint.h
> index c33bc4e..4c9853b 100644
> --- a/ext/mbstring/oniguruma/src/regint.h
> +++ b/ext/mbstring/oniguruma/src/regint.h
> @@ -201,7 +201,11 @@
> } while(0)
>
> /* sizeof(OnigCodePoint) */
> -#define WORD_ALIGNMENT_SIZE SIZEOF_SIZE_T
> +#ifdef SIZEOF_SIZE_T
> +# define WORD_ALIGNMENT_SIZE SIZEOF_SIZE_T
> +#else
> +# define WORD_ALIGNMENT_SIZE SIZEOF_LONG
> +#endif
>
> #define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
> (pad_size) = WORD_ALIGNMENT_SIZE \
>
Thanks, Lior. This piece seems to have disappeared after two upgrades since the last version in 7.2.
We probably need to invent a patch for oniguruma, so it's not lost with the next upgrade.
Regards
Anatol