luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/gi-warnings' into 'main'

Browse Source 
Avoid some warnings from GObject-Introspection

See merge request GNOME/glib!3266
This commit is contained in:
Philip Withnall 2023-02-10 13:49:22 +00:00
commit 9ab080c6ce
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gstrfuncs.h
View File

@ -147,7 +147,8 @@ gboolean (g_str_has_prefix) (const gchar *str,
const gchar *prefix); const gchar *prefix);
#if G_GNUC_CHECK_VERSION (2, 0) #if G_GNUC_CHECK_VERSION (2, 0)
#if !defined (__GTK_DOC_IGNORE__) && !defined (__GI_SCANNER__) #ifndef __GTK_DOC_IGNORE__
#ifndef __GI_SCANNER__
/* This macro is defeat a false -Wnonnull warning in GCC. /* This macro is defeat a false -Wnonnull warning in GCC.
* Without it, it thinks strlen and memcmp may be getting passed NULL * Without it, it thinks strlen and memcmp may be getting passed NULL
@ -220,7 +221,8 @@ gboolean (g_str_has_prefix) (const gchar *str,
(g_strdup) ((STR)) \ (g_strdup) ((STR)) \
) )
#endif /* !defined (__GTK_DOC_IGNORE__) && !defined (__GI_SCANNER__) */ #endif /* !defined (__GI_SCANNER__) */
#endif /* !defined (__GTK_DOC_IGNORE__) */
#endif /* G_GNUC_CHECK_VERSION (2, 0) */ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
/* String to/from double conversion functions */ /* String to/from double conversion functions */

5
glib/gtimezone.c
View File

@ -445,9 +445,7 @@ zone_for_constant_offset (GTimeZone *gtz, const gchar *name)
gtz->transitions = NULL; gtz->transitions = NULL;
} }
#ifdef G_OS_UNIX #if defined(G_OS_UNIX) && defined(__sun) && defined(__SVR4)
#if defined(__sun) && defined(__SVR4)
/* /*
* only used by Illumos distros or Solaris < 11: parse the /etc/default/init * only used by Illumos distros or Solaris < 11: parse the /etc/default/init
* text file looking for TZ= followed by the timezone, possibly quoted * text file looking for TZ= followed by the timezone, possibly quoted
@ -513,6 +511,7 @@ zone_identifier_illumos (void)
} }
#endif /* defined(__sun) && defined(__SRVR) */ #endif /* defined(__sun) && defined(__SRVR) */
#ifdef G_OS_UNIX
/* /*
* returns the path to the top of the Olson zoneinfo timezone hierarchy. * returns the path to the top of the Olson zoneinfo timezone hierarchy.
*/ */