Minor fixes for misc.cpp

Fixes conflict with tune.h STRINGIFY macro.

No functional change

diff --git a/src/misc.cpp b/src/misc.cpp
index 053ee67ecf6f7a79a75e25d29cf00c11837aa7f5..484d0b210cb6ddeeed9ac315f6bc930b063b31f1 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -155,9 +155,9 @@ const string engine_info(bool to_uci) {
 
 const std::string compiler_info() {
 
 
 const std::string compiler_info() {
 

-  #define STRINGIFY2(x) #x
-  #define STRINGIFY(x) STRINGIFY2(x)
-  #define VER_STRING(major, minor, patch) STRINGIFY(major) "." STRINGIFY(minor) "." STRINGIFY(patch)
+  #define stringify2(x) #x
+  #define stringify(x) stringify2(x)
+  #define make_version_string(major, minor, patch) stringify(major) "." stringify(minor) "." stringify(patch)

 
 /// Predefined macros hell:
 ///
 
 /// Predefined macros hell:
 ///


@@ -171,20 +171,20 @@ const std::string compiler_info() {
 
   #ifdef __clang__
      compiler += "clang++ ";
 
   #ifdef __clang__
      compiler += "clang++ ";

-     compiler += VER_STRING(__clang_major__, __clang_minor__, __clang_patchlevel__);
+     compiler += make_version_string(__clang_major__, __clang_minor__, __clang_patchlevel__);

   #elif __INTEL_COMPILER
      compiler += "Intel compiler ";
      compiler += "(version ";
   #elif __INTEL_COMPILER
      compiler += "Intel compiler ";
      compiler += "(version ";

-     compiler += STRINGIFY(__INTEL_COMPILER) " update " STRINGIFY(__INTEL_COMPILER_UPDATE);
+     compiler += stringify(__INTEL_COMPILER) " update " stringify(__INTEL_COMPILER_UPDATE);

      compiler += ")";
   #elif _MSC_VER
      compiler += "MSVC ";
      compiler += "(version ";
      compiler += ")";
   #elif _MSC_VER
      compiler += "MSVC ";
      compiler += "(version ";

-     compiler += STRINGIFY(_MSC_FULL_VER) "." STRINGIFY(_MSC_BUILD);
+     compiler += stringify(_MSC_FULL_VER) "." stringify(_MSC_BUILD);

      compiler += ")";
   #elif __GNUC__
      compiler += "g++ (GNUC) ";
      compiler += ")";
   #elif __GNUC__
      compiler += "g++ (GNUC) ";

-     compiler += VER_STRING(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+     compiler += make_version_string(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);

   #else
      compiler += "Unknown compiler ";
      compiler += "(unknown version)";
   #else
      compiler += "Unknown compiler ";
      compiler += "(unknown version)";