Core/Misc: Fix revision_data.h and boost/predef preprocessor macro conflict

(cherry picked from commit 1f5f245c02e92b967abfcd74858669be98a49333)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp
index 2c431a603f7..1060c93e275 100644
--- a/src/common/GitRevision.cpp
+++ b/src/common/GitRevision.cpp
@@ -81,26 +81,26 @@ char const* GitRevision::GetFullDatabase()
 
 char const* GitRevision::GetFullVersion()
 {
-  return "TrinityCore rev. " VER_PRODUCTVERSION_STR
-    " (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR  ", " _BUILD_DIRECTIVE ", " TRINITY_LINKAGE_TYPE_STR ")";
+    return "TrinityCore rev. " TRINITY_PRODUCTVERSION_STR
+        " (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR  ", " TRINITY_BUILD_TYPE ", " TRINITY_LINKAGE_TYPE_STR ")";
 }
 
 char const* GitRevision::GetCompanyNameStr()
 {
-    return VER_COMPANYNAME_STR;
+    return TRINITY_COMPANYNAME_STR;
 }
 
 char const* GitRevision::GetLegalCopyrightStr()
 {
-    return VER_LEGALCOPYRIGHT_STR;
+    return TRINITY_LEGALCOPYRIGHT_STR;
 }
 
 char const* GitRevision::GetFileVersionStr()
 {
-    return VER_FILEVERSION_STR;
+    return TRINITY_FILEVERSION_STR;
 }
 
 char const* GitRevision::GetProductVersionStr()
 {
-    return VER_PRODUCTVERSION_STR;
+    return TRINITY_PRODUCTVERSION_STR;
 }