Skip to content

Commit 8a24e31

Browse files
jorgsowajorgsowa
authored
Fixed undefined flags in base64 (#14316)
1 parent f6b217a commit 8a24e31

File tree

2 files changed

+53
-53
lines changed

2 files changed

+53
-53
lines changed

‎ext/standard/base64.c‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,12 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
329329

330330
/* {{{ php_base64_encode */
331331

332-
#if ZEND_INTRIN_AVX2_NATIVE
332+
#ifdef ZEND_INTRIN_AVX2_NATIVE
333333
# undef ZEND_INTRIN_SSSE3_NATIVE
334334
# undef ZEND_INTRIN_SSSE3_RESOLVER
335335
# undef ZEND_INTRIN_SSSE3_FUNC_PROTO
336336
# undef ZEND_INTRIN_SSSE3_FUNC_PTR
337-
#elif ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_SSSE3_NATIVE
337+
#elif defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_SSSE3_NATIVE)
338338
# undef ZEND_INTRIN_SSSE3_NATIVE
339339
# undef ZEND_INTRIN_SSSE3_RESOLVER
340340
# define ZEND_INTRIN_SSSE3_RESOLVER 1
@@ -345,7 +345,7 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
345345
# else
346346
# define ZEND_INTRIN_SSSE3_FUNC_DECL(func) ZEND_API func
347347
# endif
348-
#elif ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_SSSE3_NATIVE
348+
#elif defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_SSSE3_NATIVE)
349349
# undef ZEND_INTRIN_SSSE3_NATIVE
350350
# undef ZEND_INTRIN_SSSE3_RESOLVER
351351
# define ZEND_INTRIN_SSSE3_RESOLVER 1
@@ -359,54 +359,54 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
359359
#endif
360360

361361
/* Only enable avx512 resolver if avx2 use resolver also */
362-
#if ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_AVX512_FUNC_PROTO
362+
#if defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_AVX512_FUNC_PROTO)
363363
#define BASE64_INTRIN_AVX512_FUNC_PROTO 1
364364
#endif
365-
#if ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_AVX512_FUNC_PTR
365+
#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_AVX512_FUNC_PTR)
366366
#define BASE64_INTRIN_AVX512_FUNC_PTR 1
367367
#endif
368-
#if ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_AVX512_VBMI_FUNC_PROTO
368+
#if defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PROTO)
369369
#define BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO 1
370370
#endif
371-
#if ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_AVX512_VBMI_FUNC_PTR
371+
#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PTR)
372372
#define BASE64_INTRIN_AVX512_VBMI_FUNC_PTR 1
373373
#endif
374374

375-
#if ZEND_INTRIN_AVX2_NATIVE
375+
#ifdef ZEND_INTRIN_AVX2_NATIVE
376376
# include <immintrin.h>
377-
#elif ZEND_INTRIN_SSSE3_NATIVE
377+
#elif defined(ZEND_INTRIN_SSSE3_NATIVE)
378378
# include <tmmintrin.h>
379-
#elif (ZEND_INTRIN_SSSE3_RESOLVER || ZEND_INTRIN_AVX2_RESOLVER)
380-
# if ZEND_INTRIN_AVX2_RESOLVER
379+
#elif defined(ZEND_INTRIN_SSSE3_RESOLVER) || defined(ZEND_INTRIN_AVX2_RESOLVER)
380+
# ifdef ZEND_INTRIN_AVX2_RESOLVER
381381
# include <immintrin.h>
382382
# else
383383
# include <tmmintrin.h>
384384
# endif /* (ZEND_INTRIN_SSSE3_RESOLVER || ZEND_INTRIN_AVX2_RESOLVER) */
385385
# include "Zend/zend_cpuinfo.h"
386386

387-
# if BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PTR
387+
# if defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PTR)
388388
ZEND_INTRIN_AVX512_FUNC_DECL(zend_string *php_base64_encode_avx512(const unsigned char *str, size_t length, zend_long flags));
389389
ZEND_INTRIN_AVX512_FUNC_DECL(zend_string *php_base64_decode_ex_avx512(const unsigned char *str, size_t length, bool strict));
390390
# endif
391-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
391+
# if defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PTR)
392392
ZEND_INTRIN_AVX512_VBMI_FUNC_DECL(zend_string *php_base64_encode_avx512_vbmi(const unsigned char *str, size_t length, zend_long flags));
393393
ZEND_INTRIN_AVX512_VBMI_FUNC_DECL(zend_string *php_base64_decode_ex_avx512_vbmi(const unsigned char *str, size_t length, bool strict));
394394
# endif
395395

396-
# if ZEND_INTRIN_AVX2_RESOLVER
396+
# ifdef ZEND_INTRIN_AVX2_RESOLVER
397397
ZEND_INTRIN_AVX2_FUNC_DECL(zend_string *php_base64_encode_avx2(const unsigned char *str, size_t length, zend_long flags));
398398
ZEND_INTRIN_AVX2_FUNC_DECL(zend_string *php_base64_decode_ex_avx2(const unsigned char *str, size_t length, bool strict));
399399
# endif
400400

401-
# if ZEND_INTRIN_SSSE3_RESOLVER
401+
# ifdef ZEND_INTRIN_SSSE3_RESOLVER
402402
ZEND_INTRIN_SSSE3_FUNC_DECL(zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, zend_long flags));
403403
ZEND_INTRIN_SSSE3_FUNC_DECL(zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict));
404404
# endif
405405

406406
zend_string *php_base64_encode_default(const unsigned char *str, size_t length, zend_long flags);
407407
zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t length, bool strict);
408408

409-
# if (ZEND_INTRIN_AVX2_FUNC_PROTO || ZEND_INTRIN_SSSE3_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO)
409+
# if (defined(ZEND_INTRIN_AVX2_FUNC_PROTO) || defined(ZEND_INTRIN_SSSE3_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO))
410410
PHPAPI zend_string *php_base64_encode_ex(const unsigned char *str, size_t length, zend_long flags) __attribute__((ifunc("resolve_base64_encode")));
411411
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict) __attribute__((ifunc("resolve_base64_decode")));
412412

@@ -416,22 +416,22 @@ typedef zend_string *(*base64_decode_func_t)(const unsigned char *, size_t, bool
416416
ZEND_NO_SANITIZE_ADDRESS
417417
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
418418
static base64_encode_func_t resolve_base64_encode(void) {
419-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
419+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
420420
if (zend_cpu_supports_avx512_vbmi()) {
421421
return php_base64_encode_avx512_vbmi;
422422
} else
423423
# endif
424-
# if BASE64_INTRIN_AVX512_FUNC_PROTO
424+
# ifdef BASE64_INTRIN_AVX512_FUNC_PROTO
425425
if (zend_cpu_supports_avx512()) {
426426
return php_base64_encode_avx512;
427427
} else
428428
# endif
429-
# if ZEND_INTRIN_AVX2_FUNC_PROTO
429+
# ifdef ZEND_INTRIN_AVX2_FUNC_PROTO
430430
if (zend_cpu_supports_avx2()) {
431431
return php_base64_encode_avx2;
432432
} else
433433
# endif
434-
#if ZEND_INTRIN_SSSE3_FUNC_PROTO
434+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PROTO
435435
if (zend_cpu_supports_ssse3()) {
436436
return php_base64_encode_ssse3;
437437
}
@@ -442,22 +442,22 @@ static base64_encode_func_t resolve_base64_encode(void) {
442442
ZEND_NO_SANITIZE_ADDRESS
443443
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
444444
static base64_decode_func_t resolve_base64_decode(void) {
445-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
445+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
446446
if (zend_cpu_supports_avx512_vbmi()) {
447447
return php_base64_decode_ex_avx512_vbmi;
448448
} else
449449
# endif
450-
# if BASE64_INTRIN_AVX512_FUNC_PROTO
450+
# ifdef BASE64_INTRIN_AVX512_FUNC_PROTO
451451
if (zend_cpu_supports_avx512()) {
452452
return php_base64_decode_ex_avx512;
453453
} else
454454
# endif
455-
# if ZEND_INTRIN_AVX2_FUNC_PROTO
455+
# ifdef ZEND_INTRIN_AVX2_FUNC_PROTO
456456
if (zend_cpu_supports_avx2()) {
457457
return php_base64_decode_ex_avx2;
458458
} else
459459
# endif
460-
#if ZEND_INTRIN_SSSE3_FUNC_PROTO
460+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PROTO
461461
if (zend_cpu_supports_ssse3()) {
462462
return php_base64_decode_ex_ssse3;
463463
}
@@ -478,25 +478,25 @@ PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length
478478

479479
PHP_MINIT_FUNCTION(base64_intrin)
480480
{
481-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
481+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
482482
if (zend_cpu_supports_avx512_vbmi()) {
483483
php_base64_encode_ptr = php_base64_encode_avx512_vbmi;
484484
php_base64_decode_ex_ptr = php_base64_decode_ex_avx512_vbmi;
485485
} else
486486
# endif
487-
# if BASE64_INTRIN_AVX512_FUNC_PTR
487+
# ifdef BASE64_INTRIN_AVX512_FUNC_PTR
488488
if (zend_cpu_supports_avx512()) {
489489
php_base64_encode_ptr = php_base64_encode_avx512;
490490
php_base64_decode_ex_ptr = php_base64_decode_ex_avx512;
491491
} else
492492
# endif
493-
# if ZEND_INTRIN_AVX2_FUNC_PTR
493+
# ifdef ZEND_INTRIN_AVX2_FUNC_PTR
494494
if (zend_cpu_supports_avx2()) {
495495
php_base64_encode_ptr = php_base64_encode_avx2;
496496
php_base64_decode_ex_ptr = php_base64_decode_ex_avx2;
497497
} else
498498
# endif
499-
#if ZEND_INTRIN_SSSE3_FUNC_PTR
499+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PTR
500500
if (zend_cpu_supports_ssse3()) {
501501
php_base64_encode_ptr = php_base64_encode_ssse3;
502502
php_base64_decode_ex_ptr = php_base64_decode_ex_ssse3;
@@ -511,7 +511,7 @@ PHP_MINIT_FUNCTION(base64_intrin)
511511
# endif /* (ZEND_INTRIN_AVX2_FUNC_PROTO || ZEND_INTRIN_SSSE3_FUNC_PROTO) */
512512
#endif /* ZEND_INTRIN_AVX2_NATIVE */
513513

514-
#if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
514+
#if defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PTR)
515515
zend_string *php_base64_encode_avx512_vbmi(const unsigned char *str, size_t length, zend_long flags)
516516
{
517517
const unsigned char *c = str;
@@ -621,7 +621,7 @@ zend_string *php_base64_decode_ex_avx512_vbmi(const unsigned char *str, size_t l
621621
}
622622
#endif
623623

624-
#if BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PTR
624+
#if defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PTR)
625625
zend_string *php_base64_encode_avx512(const unsigned char *str, size_t length, zend_long flags)
626626
{
627627
const unsigned char *c = str;
@@ -754,8 +754,8 @@ zend_string *php_base64_decode_ex_avx512(const unsigned char *str, size_t length
754754
}
755755
#endif
756756

757-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
758-
# if ZEND_INTRIN_AVX2_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
757+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
758+
# if defined(ZEND_INTRIN_AVX2_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
759759
static __m256i php_base64_encode_avx2_reshuffle(__m256i in) __attribute__((target("avx2")));
760760
static __m256i php_base64_encode_avx2_translate(__m256i in) __attribute__((target("avx2")));
761761
# endif
@@ -819,9 +819,9 @@ static __m256i php_base64_encode_avx2_translate(__m256i in)
819819
}
820820
#endif /* ZEND_INTRIN_AVX2_NATIVE || (ZEND_INTRIN_AVX2_RESOLVER && !ZEND_INTRIN_SSSE3_NATIVE) */
821821

822-
#if ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
822+
#if defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
823823

824-
# if ZEND_INTRIN_SSSE3_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
824+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
825825
static __m128i php_base64_encode_ssse3_reshuffle(__m128i in) __attribute__((target("ssse3")));
826826
static __m128i php_base64_encode_ssse3_translate(__m128i in) __attribute__((target("ssse3")));
827827
# endif
@@ -902,10 +902,10 @@ static __m128i php_base64_encode_ssse3_translate(__m128i in)
902902

903903
#endif /* ZEND_INTRIN_SSSE3_NATIVE || (ZEND_INTRIN_SSSE3_RESOLVER && !ZEND_INTRIN_AVX2_NATIVE) */
904904

905-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
906-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_SSSE3_NATIVE
905+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
906+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_SSSE3_NATIVE)
907907
PHPAPI zend_string *php_base64_encode_ex(const unsigned char *str, size_t length, zend_long flags)
908-
# elif ZEND_INTRIN_AVX2_RESOLVER
908+
# elif defined(ZEND_INTRIN_AVX2_RESOLVER)
909909
zend_string *php_base64_encode_avx2(const unsigned char *str, size_t length, zend_long flags)
910910
# else /* ZEND_INTRIN_SSSE3_RESOLVER */
911911
zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, zend_long flags)
@@ -917,7 +917,7 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, ze
917917

918918
result = zend_string_safe_alloc(((length + 2) / 3), 4 * sizeof(char), 0, 0);
919919
o = (unsigned char *)ZSTR_VAL(result);
920-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
920+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
921921
if (length > 31) {
922922
__m256i s = _mm256_loadu_si256((__m256i *)c);
923923

@@ -949,7 +949,7 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, ze
949949
return result;
950950
}
951951

952-
# if ZEND_INTRIN_SSSE3_RESOLVER && ZEND_INTRIN_AVX2_RESOLVER
952+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(ZEND_INTRIN_AVX2_RESOLVER)
953953
zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, zend_long flags)
954954
{
955955
const unsigned char *c = str;
@@ -972,8 +972,8 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length, ze
972972

973973
/* }}} */
974974

975-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
976-
# if ZEND_INTRIN_AVX2_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
975+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
976+
# if defined(ZEND_INTRIN_AVX2_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
977977
static __m256i php_base64_decode_avx2_reshuffle(__m256i in) __attribute__((target("avx2")));
978978
# endif
979979

@@ -993,8 +993,8 @@ static __m256i php_base64_decode_avx2_reshuffle(__m256i in)
993993
}
994994
#endif
995995

996-
#if ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
997-
# if ZEND_INTRIN_SSSE3_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
996+
#if defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
997+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
998998
static __m128i php_base64_decode_ssse3_reshuffle(__m128i in) __attribute__((target("ssse3")));
999999
# endif
10001000

@@ -1075,10 +1075,10 @@ static __m128i php_base64_decode_ssse3_reshuffle(__m128i in)
10751075

10761076
#endif
10771077

1078-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
1079-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_SSSE3_NATIVE
1078+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
1079+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_SSSE3_NATIVE)
10801080
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict)
1081-
# elif ZEND_INTRIN_AVX2_RESOLVER
1081+
# elif defined(ZEND_INTRIN_AVX2_RESOLVER)
10821082
zend_string *php_base64_decode_ex_avx2(const unsigned char *str, size_t length, bool strict)
10831083
# else
10841084
zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict)
@@ -1094,7 +1094,7 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
10941094

10951095
/* See: "Faster Base64 Encoding and Decoding using AVX2 Instructions"
10961096
* https://arxiv.org/pdf/1704.00605.pdf */
1097-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
1097+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
10981098
while (length > 31 + 11 + 2) {
10991099
__m256i lut_lo, lut_hi, lut_roll;
11001100
__m256i hi_nibbles, lo_nibbles, hi, lo;
@@ -1157,7 +1157,7 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
11571157
return result;
11581158
}
11591159

1160-
# if ZEND_INTRIN_SSSE3_RESOLVER && ZEND_INTRIN_AVX2_RESOLVER
1160+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(ZEND_INTRIN_AVX2_RESOLVER)
11611161
zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict)
11621162
{
11631163
const unsigned char *c = str;
@@ -1182,8 +1182,8 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
11821182
# endif
11831183
#endif /* ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER */
11841184

1185-
#if !ZEND_INTRIN_AVX2_NATIVE && !ZEND_INTRIN_SSSE3_NATIVE
1186-
#if ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_RESOLVER
1185+
#if !defined(ZEND_INTRIN_AVX2_NATIVE) && !defined(ZEND_INTRIN_SSSE3_NATIVE)
1186+
#if defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
11871187
zend_string *php_base64_encode_default(const unsigned char *str, size_t length, zend_long flags)
11881188
#else
11891189
PHPAPI zend_string *php_base64_encode_ex(const unsigned char *str, size_t length, zend_long flags)
@@ -1203,8 +1203,8 @@ PHPAPI zend_string *php_base64_encode_ex(const unsigned char *str, size_t length
12031203
}
12041204
#endif
12051205

1206-
#if !ZEND_INTRIN_AVX2_NATIVE && !ZEND_INTRIN_SSSE3_NATIVE
1207-
#if ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_RESOLVER
1206+
#if !defined(ZEND_INTRIN_AVX2_NATIVE) && !defined(ZEND_INTRIN_SSSE3_NATIVE)
1207+
#if defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
12081208
zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t length, bool strict)
12091209
#else
12101210
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict)

‎ext/standard/base64.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5858
*/
5959

60-
#if (ZEND_INTRIN_AVX2_FUNC_PTR || ZEND_INTRIN_SSSE3_FUNC_PTR || ZEND_INTRIN_AVX512_FUNC_PTR || ZEND_INTRIN_AVX512_VBMI_FUNC_PTR) && !ZEND_INTRIN_AVX2_NATIVE
60+
#if (defined(ZEND_INTRIN_AVX2_FUNC_PTR) || defined(ZEND_INTRIN_SSSE3_FUNC_PTR) || defined(ZEND_INTRIN_AVX512_FUNC_PTR) || defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PTR)) && !defined(ZEND_INTRIN_AVX2_NATIVE)
6161
PHP_MINIT_FUNCTION(base64_intrin);
6262
#endif
6363

0 commit comments

Comments
 (0)