diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-09 14:46:41 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-09 14:46:41 +0000 |
| commit | 6efb88cf08d016e3c012ece96efaedb965ea62e0 (patch) | |
| tree | d7fcbdeb297fa7ea4ffc031b8b4c9d9b6fa568cd /ACE/ace/Stack_Trace.cpp | |
| parent | 39a48de76b69852b948818994a3fa99d1f1fc367 (diff) | |
| download | ATCD-6efb88cf08d016e3c012ece96efaedb965ea62e0.tar.gz | |
ChangeLogTag: Mon Jun 09 14:46:00 UTC 2008 Simon Massey <sma at prismtech dot com>
Diffstat (limited to 'ACE/ace/Stack_Trace.cpp')
| -rw-r--r-- | ACE/ace/Stack_Trace.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp index 21199a9036b..577c9fc89ac 100644 --- a/ACE/ace/Stack_Trace.cpp +++ b/ACE/ace/Stack_Trace.cpp @@ -481,13 +481,13 @@ static bool load_dbghelp_library_if_needed (dbghelp_functions *pDbg) //@TODO: See codeproject's StackWalker.cpp for the list of locations to //search so we get the "enhanced" dbghelp if the user has it but it is not //first on the path. - if (!(pDbg->hMod = LoadLibrary (TEXT ("Dbghelp")))) + if (!(pDbg->hMod = LoadLibrary (ACE_TEXT ("Dbghelp")))) return false; //@TODO: Cache this so we don't have to re-link every time. When to unload? # define LINK(TYPE, NAME) (pDbg->NAME = \ - (TYPE) GetProcAddress (pDbg->hMod, TEXT (#NAME))) + (TYPE) GetProcAddress (pDbg->hMod, ACE_TEXT (#NAME))) # define LINK_T(NAME) LINK (dbghelp_functions::NAME##_t, NAME) return LINK (PGET_MODULE_BASE_ROUTINE64, SymGetModuleBase64) && LINK (PFUNCTION_TABLE_ACCESS_ROUTINE64, SymFunctionTableAccess64) @@ -609,9 +609,9 @@ cs_operate(int (*func)(struct frame_state const *, void *), void *usrarg, fs.pSym = (PSYMBOL_INFO) GlobalAlloc (GMEM_FIXED, sizeof (SYMBOL_INFO) + - sizeof (TCHAR) * (SYMSIZE - 1)); + sizeof (ACE_TCHAR) * (SYMSIZE - 1)); fs.pSym->SizeOfStruct = sizeof (SYMBOL_INFO); - fs.pSym->MaxNameLen = SYMSIZE * sizeof (TCHAR); + fs.pSym->MaxNameLen = SYMSIZE * sizeof (ACE_TCHAR); dbg.SymSetOptions (SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES | SYMOPT_FAIL_CRITICAL_ERRORS | dbg.SymGetOptions ()); dbg.SymInitialize (GetCurrentProcess (), 0, true); |