Skip to content

Commit ea8487d

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
2 parents 33a49bb + 3a8307d commit ea8487d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

ext/dba/libinifile/inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void inifile_free(inifile *dba, int persistent)
111111
key_type inifile_key_split(const char *group_name)
112112
{
113113
key_type key;
114-
char *name;
114+
const char *name;
115115

116116
if (group_name[0] == '[' && (name = strchr(group_name, ']')) != NULL) {
117117
key.group = estrndup(group_name+1, name - (group_name + 1));

ext/readline/readline_cli.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,8 @@ static char *cli_completion_generator(const char *text, int index) /* {{{ */
529529
} else if (text[0] == '#' && text[1] != '[') {
530530
retval = cli_completion_generator_ini(text, textlen, &cli_completion_state);
531531
} else {
532-
char *lc_text, *class_name_end;
532+
char *lc_text;
533+
const char *class_name_end;
533534
zend_string *class_name = NULL;
534535
zend_class_entry *ce = NULL;
535536

0 commit comments

Comments
 (0)