[lmi-commits] [6454] Forestall gcc-4.9.2 external attribute warnings

[Greg Chicares]

Revision: 6454
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6454
Author:   chicares
Date:     2015-12-21 01:38:12 +0000 (Mon, 21 Dec 2015)
Log Message:
-----------
Forestall gcc-4.9.2 external attribute warnings

Modified Paths:
--------------
    lmi/trunk/cpp_main.cpp
    lmi/trunk/main_common.cpp
    lmi/trunk/wx_new_test.cpp

Modified: lmi/trunk/cpp_main.cpp
===================================================================
--- lmi/trunk/cpp_main.cpp      2015-12-21 01:27:39 UTC (rev 6453)
+++ lmi/trunk/cpp_main.cpp      2015-12-21 01:38:12 UTC (rev 6454)
@@ -79,7 +79,14 @@
 /// For the (corrected) return type, see:
 ///   http://lists.nongnu.org/archive/html/lmi/2011-06/msg00040.html
 
+#   if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#       pragma GCC diagnostic push
+#       pragma GCC diagnostic ignored "-Wattributes"
+#   endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 extern "C" unsigned int _get_output_format(void) {return 1;}
+#   if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#       pragma GCC diagnostic pop
+#   endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 #endif // defined __MINGW32__
 
 // main()  ------------------------------------------------------------------//

Modified: lmi/trunk/main_common.cpp
===================================================================
--- lmi/trunk/main_common.cpp   2015-12-21 01:27:39 UTC (rev 6453)
+++ lmi/trunk/main_common.cpp   2015-12-21 01:38:12 UTC (rev 6454)
@@ -45,7 +45,14 @@
 /// For the (corrected) return type, see:
 ///   http://lists.nongnu.org/archive/html/lmi/2011-06/msg00040.html
 
+#   if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#       pragma GCC diagnostic push
+#       pragma GCC diagnostic ignored "-Wattributes"
+#   endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 extern "C" unsigned int _get_output_format(void) {return 1;}
+#   if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#       pragma GCC diagnostic pop
+#   endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 #endif // defined __MINGW32__
 
 /// Common application initialization.

Modified: lmi/trunk/wx_new_test.cpp
===================================================================
--- lmi/trunk/wx_new_test.cpp   2015-12-21 01:27:39 UTC (rev 6453)
+++ lmi/trunk/wx_new_test.cpp   2015-12-21 01:38:12 UTC (rev 6454)
@@ -33,7 +33,19 @@
 // The '.cpp' file is deliberately included here instead of the header
 // because it was probably already compiled for inclusion in a dll,
 // resulting in an object that wouldn't necessarily work here.
+//
+// Explicitly include "wx_new.hpp" first for LMI_GCC_VERSION from
+// "config.hpp".
+
+#include "wx_new.hpp"
+#if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wattributes"
+#endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 #include "wx_new.cpp"
+#if defined __GNUC__ && 40600 <= LMI_GCC_VERSION
+#   pragma GCC diagnostic pop
+#endif // defined __GNUC__ && 40600 <= LMI_GCC_VERSION
 
 #include "test_tools.hpp"