[lmi-commits] [6456] Prepare to use MinGW-w64 gcc

[Greg Chicares]

Revision: 6456
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6456
Author:   chicares
Date:     2015-12-21 02:31:18 +0000 (Mon, 21 Dec 2015)
Log Message:
-----------
Prepare to use MinGW-w64 gcc

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/config.hpp
    lmi/trunk/test_coding_rules.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-12-21 01:59:37 UTC (rev 6455)
+++ lmi/trunk/ChangeLog 2015-12-21 02:31:18 UTC (rev 6456)
@@ -38332,3 +38332,34 @@
 Improve boost standard conformance. See:
   http://lists.nongnu.org/archive/html/lmi/2015-12/msg00041.html
 
+20151221T0120Z <address@hidden> [456]
+
+  snprintf_test.cpp
+Fix link rot.
+
+20151221T0127Z <address@hidden> [456]
+
+  bcc_ld.cpp
+  math_functors_test.cpp
+Forestall gcc-4.9.2 "unused" warnings.
+
+20151221T0138Z <address@hidden> [456]
+
+  cpp_main.cpp
+  main_common.cpp
+  wx_new_test.cpp
+Forestall gcc-4.9.2 external attribute warnings.
+
+20151221T0159Z <address@hidden> [456]
+
+  database_document.hpp
+  so_attributes.hpp
+  wx_utility.hpp
+Forestall gcc-4.9.2 internal attribute warnings.
+
+20151221T0231Z <address@hidden> [456]
+
+  config.hpp
+  test_coding_rules.cpp
+Prepare to use MinGW-w64 gcc.
+

Modified: lmi/trunk/config.hpp
===================================================================
--- lmi/trunk/config.hpp        2015-12-21 01:59:37 UTC (rev 6455)
+++ lmi/trunk/config.hpp        2015-12-21 02:31:18 UTC (rev 6456)
@@ -70,6 +70,11 @@
 #   error Unknown hardware. Consider contributing support.
 #endif // Unknown hardware.
 
+#if defined __GNUC__
+// This selects a correct snprintf() for MinGW-w64.
+#   define _ISOC99_SOURCE
+#endif // defined __GNUC__
+
 // 'platform_dependent.hpp' includes standard headers in an unusual
 // way, and must be included before any standard headers are seen.
 // Do that here to quarantine the weirdness.
@@ -113,7 +118,12 @@
 #   include <_mingw.h>
 #endif // __MINGW32__
 
-#if defined __MINGW32_VERSION
+// This is RTL version, not gcc version. As to MinGW-w64, see:
+//   http://comments.gmane.org/gmane.comp.gnu.mingw.w64.general/641
+// No attempt is made to distinguish the MinGW-w64 versus mingw.org
+// toolchains: lmi used the mingw.org toolchain through gcc-3.4.5,
+// and switched to MinGW-w64's gcc-4.9.2 circa 2016-01-01.
+#if defined __MINGW32_VERSION || defined __MINGW64_VERSION_MAJOR
 #   define LMI_MINGW_VERSION \
         (__MINGW32_MAJOR_VERSION * 100 + __MINGW32_MINOR_VERSION)
 #endif // __MINGW32_VERSION

Modified: lmi/trunk/test_coding_rules.cpp
===================================================================
--- lmi/trunk/test_coding_rules.cpp     2015-12-21 01:59:37 UTC (rev 6455)
+++ lmi/trunk/test_coding_rules.cpp     2015-12-21 02:31:18 UTC (rev 6456)
@@ -826,6 +826,7 @@
         ,"__MINGW32_MINOR_VERSION"
         ,"__MINGW32_VERSION"
         ,"__MINGW32__"
+        ,"__MINGW64_VERSION_MAJOR"
         ,"__MINGW_H"
         ,"_fmode"
     // Compiler specific: glibc.