luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the -Werror=format-nonliteral fixes for older GCCs

Browse Source 
They don't allow that pragma inside functions.
This commit is contained in:
John Ralls
2013-09-29 11:33:30 -07:00
parent 09d83640a8
commit ab5aa2aa3a
6 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gthreadedresolver.c
View File

@@ -505,6 +505,9 @@ g_resolver_record_type_to_rrtype (GResolverRecordType type)
g_return_val_if_reached (-1);
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static GList *
g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
@@ -543,10 +546,7 @@ g_resolver_records_from_res_query (const gchar *rrname,
format = _("Error resolving '%s'");
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
g_set_error (error, G_RESOLVER_ERROR, errnum, format, rrname);
#pragma GCC diagnostic pop
return NULL;
}
@@ -622,6 +622,8 @@ g_resolver_records_from_res_query (const gchar *rrname,
return records;
}
#pragma GCC diagnostic pop
#elif defined(G_OS_WIN32)
static GVariant *