* [gentoo-commits] gentoo-x86 commit in sys-fs/udisks/files: udisks-2.0.1-pragma.patch
@ 2012-12-17 23:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-12-17 23:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/12/17 23:13:49
Added: udisks-2.0.1-pragma.patch
Log:
Version bump.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.1 sys-fs/udisks/files/udisks-2.0.1-pragma.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-2.0.1-pragma.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-2.0.1-pragma.patch?rev=1.1&content-type=text/plain
Index: udisks-2.0.1-pragma.patch
===================================================================
From 02c041674cbcbee75e7fe70095f37c35837f4901 Mon Sep 17 00:00:00 2001
From: David Zeuthen <zeuthen@gmail.com>
Date: Sat, 13 Oct 2012 09:58:48 +0000
Subject: Only use #pragma GCC diagnostic on GCC >= 4.6
https://bugs.freedesktop.org/show_bug.cgi?id=52614
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
---
diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
index 22c20b8..4a5a4b0 100644
--- a/udisks/udisksclient.c
+++ b/udisks/udisksclient.c
@@ -25,6 +25,11 @@
#include "udiskserror.h"
#include "udisks-generated.h"
+/* For __GNUC_PREREQ usage below */
+#ifdef __GNUC__
+# include <features.h>
+#endif
+
/**
* SECTION:udisksclient
* @title: UDisksClient
@@ -1922,14 +1927,22 @@ udisks_client_get_id_for_display (UDisksClient *client,
(g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0))
{
/* we know better than the compiler here */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#ifdef __GNUC_PREREQ
+# if __GNUC_PREREQ(4,6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
+# endif
+#endif
if (long_string)
ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].long_name), version);
else
ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version);
goto out;
-#pragma GCC diagnostic pop
+#ifdef __GNUC_PREREQ
+# if __GNUC_PREREQ(4,6)
+# pragma GCC diagnostic pop
+# endif
+#endif
}
}
}
--
cgit v0.9.0.2-2-gbebe
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udisks/files: udisks-2.0.1-pragma.patch
@ 2013-03-19 19:43 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-19 19:43 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/19 19:43:44
Removed: udisks-2.0.1-pragma.patch
Log:
old
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-19 19:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 23:13 [gentoo-commits] gentoo-x86 commit in sys-fs/udisks/files: udisks-2.0.1-pragma.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-03-19 19:43 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox