From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 22 Apr 2014 22:04:11 +0000 (+0400)
Subject: Fix TEXT() usage for concatenated strings in GC_CreateLogFile (Win32)
X-Git-Tag: gc7_4_2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ed49676a59c94779b4fa67ff46edd40b58c86ca;p=gc

Fix TEXT() usage for concatenated strings in GC_CreateLogFile (Win32)

* misc.c (GC_CreateLogFile): Use TEXT() for each of concatenated
literals (fix "concatenating mismatched strings" error if UNICODE
defined).
---

diff --git a/misc.c b/misc.c
index a61a4261..6378a1fb 100644
--- a/misc.c
+++ b/misc.c
@@ -1327,8 +1327,8 @@ GC_API void GC_CALL GC_enable_incremental(void)
         if (len > 4 && pathBuf[len - 4] == (TCHAR)'.') {
           len -= 4; /* strip executable file extension */
         }
-        BCOPY(TEXT("." GC_LOG_STD_NAME), &pathBuf[len],
-              sizeof(TEXT("." GC_LOG_STD_NAME)));
+        BCOPY(TEXT(".") TEXT(GC_LOG_STD_NAME), &pathBuf[len],
+              sizeof(TEXT(".") TEXT(GC_LOG_STD_NAME)));
 #     endif
     }