From: Stefan Kueng Date: Sun, 5 Dec 2010 17:48:56 +0000 (+0100) Subject: Windows: fix checked UNICODE build of talocale X-Git-Tag: openafs-devel-1_7_1~1143 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=a433f750ad7f0a3c0adbf4c5d6221b7517c0eedb;hp=6fe9313180dfe1d509ae97a1e16a67195357cf7b Windows: fix checked UNICODE build of talocale src/WINNT/talocale failed to build/link for checked builds. Fix it. Change-Id: I39eb1605f67afdbd0f4ad04bb7ec560501410fbe Reviewed-on: http://gerrit.openafs.org/3446 Tested-by: Stefan Kueng Reviewed-by: Stefan Kueng Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- diff --git a/src/WINNT/talocale/tal_alloc.h b/src/WINNT/talocale/tal_alloc.h index 90a0dec..41f8654 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 */