From: Stefan Kueng <tortoisesvn@gmail.com>
Date: Sun, 5 Dec 2010 17:48:56 +0000 (+0100)
Subject: Windows: fix checked UNICODE build of talocale
X-Git-Tag: upstream/1.6.0.pre2^2~113
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e052fe1a30aa09940a86b5b78d420d90c3b5dc50;p=packages%2Fo%2Fopenafs.git

Windows: fix checked UNICODE build of talocale

src/WINNT/talocale failed to build/link for checked builds. Fix it.

Reviewed-on: http://gerrit.openafs.org/3446
Tested-by: Stefan Kueng <tortoisesvn@gmail.com>
Reviewed-by: Stefan Kueng <tortoisesvn@gmail.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit a433f750ad7f0a3c0adbf4c5d6221b7517c0eedb)

Change-Id: Ie7e2e7778efd0c6d9724f1eb65adf8942141a47e
Reviewed-on: http://gerrit.openafs.org/3791
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/WINNT/talocale/tal_alloc.h b/src/WINNT/talocale/tal_alloc.h
index 90a0decf2..41f8654fc 100644
--- a/src/WINNT/talocale/tal_alloc.h
+++ b/src/WINNT/talocale/tal_alloc.h
@@ -105,11 +105,11 @@
 
 #else /* NO_DEBUG_ALLOC */
 
-#define Allocate(_s)   MemMgr_AllocateMemory (_s, #_s, __FILE__, __LINE__)
-#define Free(_p)       MemMgr_FreeMemory (_p, __FILE__, __LINE__)
-#define New(_t)        (_t*)MemMgr_TrackNew (new _t, sizeof(_t), #_t, __FILE__, __LINE__)
-#define New2(_t,_a)    (_t*)MemMgr_TrackNew (new _t _a, sizeof(_t), #_t, __FILE__, __LINE__)
-#define Delete(_p)     do { MemMgr_TrackDelete (_p, __FILE__, __LINE__); delete _p; } while(0)
+#define Allocate(_s)   MemMgr_AllocateMemory (_s, TEXT(#_s), TEXT(__FILE__), __LINE__)
+#define Free(_p)       MemMgr_FreeMemory (_p, TEXT(__FILE__), __LINE__)
+#define New(_t)        (_t*)MemMgr_TrackNew (new _t, sizeof(_t), TEXT(#_t), TEXT(__FILE__), __LINE__)
+#define New2(_t,_a)    (_t*)MemMgr_TrackNew (new _t _a, sizeof(_t), TEXT(#_t), TEXT(__FILE__), __LINE__)
+#define Delete(_p)     do { MemMgr_TrackDelete (_p, TEXT(__FILE__), __LINE__); delete _p; } while(0)
 
 #endif /* NO_DEBUG_ALLOC */
 
@@ -133,11 +133,11 @@ EXPORTED BOOL MEMMGR_CALLCONV IsMemoryManagerMessage (MSG *pMsg);
 
 #ifndef NO_DEBUG_ALLOC
 
-EXPORTED PVOID MEMMGR_CALLCONV MemMgr_AllocateMemory (size_t cb, LPSTR pszExpr, LPSTR pszFile, DWORD dwLine);
-EXPORTED void MEMMGR_CALLCONV MemMgr_FreeMemory (PVOID pData, LPSTR pszFile, DWORD dwLine);
+EXPORTED PVOID MEMMGR_CALLCONV MemMgr_AllocateMemory (size_t cb, LPTSTR pszExpr, LPTSTR pszFile, DWORD dwLine);
+EXPORTED void MEMMGR_CALLCONV MemMgr_FreeMemory (PVOID pData, LPTSTR pszFile, DWORD dwLine);
 
-EXPORTED PVOID MEMMGR_CALLCONV MemMgr_TrackNew (PVOID pData, size_t cb, LPSTR pszExpr, LPSTR pszFile, DWORD dwLine);
-EXPORTED void MEMMGR_CALLCONV MemMgr_TrackDelete (PVOID pData, LPSTR pszFile, DWORD dwLine);
+EXPORTED PVOID MEMMGR_CALLCONV MemMgr_TrackNew (PVOID pData, size_t cb, LPTSTR pszExpr, LPTSTR pszFile, DWORD dwLine);
+EXPORTED void MEMMGR_CALLCONV MemMgr_TrackDelete (PVOID pData, LPTSTR pszFile, DWORD dwLine);
 
 #endif /* NO_DEBUG_ALLOC */