diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2017-03-20 06:01:57 -0500 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2017-03-20 06:01:57 -0500 |
| commit | 64cbed988423449dd9f687b3658695a404d4085c (patch) | |
| tree | 2521094f92bda032df65b841e85be157fb160208 /glib | |
| parent | 325ddf2f4b19a9084dedd3d458f7d02f5b854dec (diff) | |
| download | pkg-config-64cbed988423449dd9f687b3658695a404d4085c.tar.gz | |
glib: Fix bundled build with GCC 6
Backport two patches from upstream glib to handle -Wformat-nonliteral
included by default with GCC 6. Ideally the snapshot should be updated,
but this fix the issue until that happens.
https://bugs.freedesktop.org/show_bug.cgi?id=95326
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/glib/gdate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c index 1978cf7..20e6c4a 100644 --- a/glib/glib/gdate.c +++ b/glib/glib/gdate.c @@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d, * * Returns: number of characters written to the buffer, or 0 the buffer was too small */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" + gsize g_date_strftime (gchar *s, gsize slen, @@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s, return retval; #endif } + +#pragma GCC diagnostic pop |