[Xfce4-commits] [apps/mousepad] 01/04: Check for gcc version for push/pop pragmas, fixes build on OpenBSD.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/mousepad.

commit c15a1b2c60be0158f6011a0d9e424b51fd16449e
Author: Landry Breuil <landry at xfce.org>
Date:   Sat Feb 28 13:37:12 2015 +0100

    Check for gcc version for push/pop pragmas, fixes build on OpenBSD.
---
 mousepad/mousepad-print.c      |    4 ++--
 mousepad/mousepad-search-bar.c |    4 ++--
 mousepad/mousepad-window.c     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mousepad/mousepad-print.c b/mousepad/mousepad-print.c
index b7fadc7..d835f97 100644
--- a/mousepad/mousepad-print.c
+++ b/mousepad/mousepad-print.c
@@ -701,7 +701,7 @@ mousepad_print_create_custom_widget (GtkPrintOperation *operation)
   gtk_widget_show (alignment);
 
   /* In GTK3, GtkTable is deprecated */
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -742,7 +742,7 @@ mousepad_print_create_custom_widget (GtkPrintOperation *operation)
   g_signal_connect (G_OBJECT (print->widget_line_numbers_font), "font-set", G_CALLBACK (mousepad_print_button_font_set), print);
   gtk_widget_show (print->widget_line_numbers_font);
 
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic pop
 #endif
 
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index 3315ed9..6690109 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -137,7 +137,7 @@ mousepad_search_bar_class_init (MousepadSearchBarClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "hide-bar", 0);
 
   /* In GTK3, gtkrc is deprecated */
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -156,7 +156,7 @@ mousepad_search_bar_class_init (MousepadSearchBarClass *klass)
                          "}\n"
                        "widget \"MousepadWindow.*.Gtk*ToolButton\" style \"mousepad-button-style\"\n");
 
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic pop
 #endif
 
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index ae55465..f1acc2b 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -865,7 +865,7 @@ mousepad_window_create_root_warning (MousepadWindow *window)
       GtkWidget *ebox, *label, *separator;
 
   /* In GTK3, gtkrc is deprecated */
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -879,7 +879,7 @@ mousepad_window_create_root_warning (MousepadWindow *window)
                            "widget\"MousepadWindow.*.root-warning\"style\"mousepad-window-root-style\"\n"
                            "widget\"MousepadWindow.*.root-warning.GtkLabel\"style\"mousepad-window-root-style\"\n");
 
-#if GTK_CHECK_VERSION(3, 0, 0) && defined(__GNUC__)
+#if GTK_CHECK_VERSION(3, 0, 0) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2)
 # pragma GCC diagnostic pop
 #endif
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.