Skip to content

Commit 6c0efb7

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: 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 0a03d10 + ea8487d commit 6c0efb7

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
@@ -109,7 +109,7 @@ void inifile_free(inifile *dba, int persistent)
109109
key_type inifile_key_split(const char *group_name)
110110
{
111111
key_type key;
112-
char *name;
112+
const char *name;
113113

114114
if (group_name[0] == '[' && (name = strchr(group_name, ']')) != NULL) {
115115
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
@@ -527,7 +527,8 @@ static char *cli_completion_generator(const char *text, int index) /* {{{ */
527527
} else if (text[0] == '#' && text[1] != '[') {
528528
retval = cli_completion_generator_ini(text, textlen, &cli_completion_state);
529529
} else {
530-
char *lc_text, *class_name_end;
530+
char *lc_text;
531+
const char *class_name_end;
531532
zend_string *class_name = NULL;
532533
zend_class_entry *ce = NULL;
533534

0 commit comments

Comments
 (0)