From 4916249f72314ecab55ba44a64ca6df342645830 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Tue, 24 Mar 2020 21:25:46 -0400
Subject: [PATCH] Move block so git does not think there is a conflict.

---
 include/boost/config/auto_link.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index 5513bf3f..ebb088ac 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -436,6 +436,12 @@ BOOST_LIB_SUFFIX:     Static/import libraries extension (".lib", ".a") for the c
 #  define BOOST_LIB_PREFIX "lib"
 #endif
 
+#if defined(BOOST_EMBTC_WIN64)
+#  define BOOST_LIB_SUFFIX ".a"
+#else
+#  define BOOST_LIB_SUFFIX ".lib"
+#endif
+
 //
 // now include the lib:
 //
@@ -447,12 +453,6 @@ BOOST_LIB_SUFFIX:     Static/import libraries extension (".lib", ".a") for the c
       && defined(BOOST_LIB_ARCH_AND_MODEL_OPT) \
       && defined(BOOST_LIB_VERSION)
 
-#if defined(BOOST_EMBTC_WIN64)
-#  define BOOST_LIB_SUFFIX ".a"
-#else
-#  define BOOST_LIB_SUFFIX ".lib"
-#endif
-
 #ifdef BOOST_AUTO_LINK_NOMANGLE
 #  pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_SUFFIX)
 #  ifdef BOOST_LIB_DIAGNOSTIC