Skip to content

Commit 159ef14

Browse files
committed
Fix GH-20492: mbstring compile warning due to non-strings
This is a partial backport of ea69276, but without changing public headers as that's not allowed at this point. Closes GH-20494.
1 parent a1912e3 commit 159ef14

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ PHP NEWS
2929
- MbString:
3030
. Fixed bug GH-20491 (SLES15 compile error with mbstring oniguruma).
3131
(ndossche)
32+
. Fixed bug GH-20492 (mbstring compile warning due to non-strings).
33+
(ndossche)
3234

3335
- Opcache:
3436
. Fixed bug GH-20329 (opcache.file_cache broken with full interned string

ext/mbstring/libmbfl/filters/mbfilter_cjk.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,21 @@
2121
* This macro converts uppercase ASCII values to Regional Indicator codepoints */
2222
#define NFLAGS(c) (0x1F1A5+((unsigned int)(c)))
2323

24-
static const char nflags_s[10][2] = {"CN", "DE", "ES", "FR", "GB", "IT", "JP", "KR", "RU", "US"};
24+
#if __has_attribute(nonstring) && defined(__GNUC__) && ((!defined(__clang__) && __GNUC__ >= 15) || (defined(__clang_major__) && __clang_major__ >= 20))
25+
# define ZEND_NONSTRING __attribute__((nonstring))
26+
#else
27+
# define ZEND_NONSTRING
28+
#endif
29+
30+
static const char nflags_s[10][2] ZEND_NONSTRING = {"CN", "DE", "ES", "FR", "GB", "IT", "JP", "KR", "RU", "US"};
2531
static const int nflags_code_kddi[10] = { 0x2549, 0x2546, 0x24C0, 0x2545, 0x2548, 0x2547, 0x2750, 0x254A, 0x24C1, 0x27F7 };
2632
static const int nflags_code_sb[10] = { 0x2B0A, 0x2B05, 0x2B08, 0x2B04, 0x2B07, 0x2B06, 0x2B02, 0x2B0B, 0x2B09, 0x2B03 };
2733

2834
#define EMIT_KEYPAD_EMOJI(c) do { *snd = (c); return 0x20E3; } while(0)
2935
#define EMIT_FLAG_EMOJI(country) do { *snd = NFLAGS((country)[0]); return NFLAGS((country)[1]); } while(0)
3036

31-
static const char nflags_kddi[6][2] = {"FR", "DE", "IT", "GB", "CN", "KR"};
32-
static const char nflags_sb[10][2] = {"JP", "US", "FR", "DE", "IT", "GB", "ES", "RU", "CN", "KR"};
37+
static const char nflags_kddi[6][2] ZEND_NONSTRING = {"FR", "DE", "IT", "GB", "CN", "KR"};
38+
static const char nflags_sb[10][2] ZEND_NONSTRING = {"JP", "US", "FR", "DE", "IT", "GB", "ES", "RU", "CN", "KR"};
3339

3440
/* number -> (ku*94)+ten value for telephone keypad character */
3541
#define DOCOMO_KEYPAD(n) ((n) == 0 ? 0x296F : (0x2965 + (n)))

ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,13 @@ int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter)
397397
* This macro converts uppercase ASCII values to Regional Indicator codepoints */
398398
#define NFLAGS(c) (0x1F1A5+(int)(c))
399399

400-
static const char nflags_s[10][2] = {"CN","DE","ES","FR","GB","IT","JP","KR","RU","US"};
400+
#if __has_attribute(nonstring) && defined(__GNUC__) && ((!defined(__clang__) && __GNUC__ >= 15) || (defined(__clang_major__) && __clang_major__ >= 20))
401+
# define ZEND_NONSTRING __attribute__((nonstring))
402+
#else
403+
# define ZEND_NONSTRING
404+
#endif
405+
406+
static const char nflags_s[10][2] ZEND_NONSTRING = {"CN","DE","ES","FR","GB","IT","JP","KR","RU","US"};
401407
static const int nflags_code_kddi[10] = { 0x2549, 0x2546, 0x24C0, 0x2545, 0x2548, 0x2547, 0x2750, 0x254A, 0x24C1, 0x27F7 };
402408
static const int nflags_code_sb[10] = { 0x2B0A, 0x2B05, 0x2B08, 0x2B04, 0x2B07, 0x2B06, 0x2B02, 0x2B0B, 0x2B09, 0x2B03 };
403409

0 commit comments

Comments
 (0)