[glib] Move pragmas out of function body
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Move pragmas out of function body
- Date: Mon, 30 Jan 2012 20:25:28 +0000 (UTC)
commit 96f9997387e77cfa567e008f08c75007300e4590
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Jan 30 15:25:09 2012 -0500
Move pragmas out of function body
It seems that older gcc does not like pragmas inside functions.
gio/giomodule.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 9c3fdf0..9ccc3e3 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -809,6 +809,8 @@ DllMain (HINSTANCE hinstDLL,
#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void
_g_io_modules_ensure_extension_points_registered (void)
{
@@ -823,11 +825,8 @@ _g_io_modules_ensure_extension_points_registered (void)
#ifdef G_OS_UNIX
#if !GLIB_CHECK_VERSION (3, 0, 0)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
-#pragma GCC diagnostic pop
#endif
#endif
@@ -863,7 +862,8 @@ _g_io_modules_ensure_extension_points_registered (void)
}
G_UNLOCK (registered_extensions);
- }
+}
+#pragma GCC diagnostic pop
void
_g_io_modules_ensure_loaded (void)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]