Commit 386a467
authored
ext/intl: fix build with older ICU (#23539)
Covariant return types for clone() were only introduced in ICU 65;
before that NumberFormat::clone() returns Format*, so cast the result
explicitly in NumberFormatter_object_clone().
<unicode/numberrangeformatter.h> is a C++-only header, and older ICU
does not wrap it in U_SHOW_CPLUSPLUS_API, so including it from
php_intl.c breaks the C compile. Move it into the __cplusplus branch,
next to the using declaration that needs it.1 parent 78c33e0 commit 386a467
2 files changed
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | 18 | | |
| 19 | + | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
0 commit comments