Fix warnings with gcc 15 and glibc 2.43.

* libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h (g_strstr_len): Change
return type to 'const gchar *'.
* libtextstyle/gnulib-local/lib/glib/gstrfuncs.c (g_strstr_len): Likewise.
* libtextstyle/gnulib-local/lib/libcroco/cr-rgb.c (cr_rgb_set_from_name): Change
type of 'result'.
* gettext-tools/src/cldr-plurals.c (extract_rules): Cast the sb_xcontents_c
result to 'char *'.
This commit is contained in:
Bruno Haible 2026-01-25 04:51:32 +01:00
parent d5c190b1fd
commit c636580a49
4 changed files with 7 additions and 7 deletions

View File

@ -158,7 +158,7 @@ extract_rules (FILE *fp,
{
/* Scrub the last semicolon, if any. */
char *p = strrchr (sb_xcontents_c (&buffer), ';');
char *p = strrchr ((char *) sb_xcontents_c (&buffer), ';');
if (p)
*p = '\0';
}

View File

@ -1,5 +1,5 @@
/* GLIB - Library of useful routines for C programming
* Copyright (C) 2006-2024 Free Software Foundation, Inc.
* Copyright (C) 2006-2026 Free Software Foundation, Inc.
*
* This file is not part of the GNU gettext program, but is used with
* GNU gettext.
@ -2610,7 +2610,7 @@ g_strjoin (const gchar *separator,
* Return value: a pointer to the found occurrence, or
* %NULL if not found.
**/
gchar *
const gchar *
g_strstr_len (const gchar *haystack,
gssize haystack_len,
const gchar *needle)

View File

@ -1,5 +1,5 @@
/* GLIB - Library of useful routines for C programming
* Copyright (C) 2006-2019 Free Software Foundation, Inc.
* Copyright (C) 2006-2026 Free Software Foundation, Inc.
*
* This file is not part of the GNU gettext program, but is used with
* GNU gettext.
@ -124,7 +124,7 @@ gsize g_strlcat (gchar *dest,
const gchar *src,
gsize dest_size);
#endif
gchar * g_strstr_len (const gchar *haystack,
const gchar * g_strstr_len (const gchar *haystack,
gssize haystack_len,
const gchar *needle);
#if 0

View File

@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode:nil; c-basic-offset: 8-*- */
/* libcroco - Library for parsing and applying CSS
* Copyright (C) 2006-2019 Free Software Foundation, Inc.
* Copyright (C) 2006-2026 Free Software Foundation, Inc.
*
* This file is not part of the GNU gettext program, but is used with
* GNU gettext.
@ -483,7 +483,7 @@ enum CRStatus
cr_rgb_set_from_name (CRRgb * a_this, const guchar * a_color_name)
{
enum CRStatus status = CR_OK;
CRRgb *result;
CRRgb const *result;
g_return_val_if_fail (a_this && a_color_name, CR_BAD_PARAM_ERROR);