- Make symdump and ctm msvc-aware

svn path=/trunk/; revision=42367

diff --git a/rosapps/applications/devutils/symdump/symdump.c b/rosapps/applications/devutils/symdump/symdump.c
index 4359f60..ef28d14 100644 (file)
--- a/rosapps/applications/devutils/symdump/symdump.c
+++ b/rosapps/applications/devutils/symdump/symdump.c
@@ -807,6 +807,7 @@ DumpParams(PSYMBOL_INFO pSymInfo, PENUMINFO pei)
 {
        IMAGEHLP_STACK_FRAME sf;
        BOOL bRet;
 {
        IMAGEHLP_STACK_FRAME sf;
        BOOL bRet;

+       INT NumLocals = 0; // the number of local variables found

 
        sf.InstructionOffset = pSymInfo->Address;
 
 
        sf.InstructionOffset = pSymInfo->Address;
 


@@ -822,8 +823,6 @@ DumpParams(PSYMBOL_INFO pSymInfo, PENUMINFO pei)
 
        // Enumerate local variables
 
 
        // Enumerate local variables
 

-       INT NumLocals = 0; // the number of local variables found
-

        bRet = SymEnumSymbols(pei->hProcess, 0, 0, EnumParamsProc, &NumLocals);
 
        if (!bRet)
        bRet = SymEnumSymbols(pei->hProcess, 0, 0, EnumParamsProc, &NumLocals);
 
        if (!bRet)

diff --git a/rosapps/applications/sysutils/ctm/ctm.c b/rosapps/applications/sysutils/ctm/ctm.c
index 1e2cb53..948caf1 100644 (file)
--- a/rosapps/applications/sysutils/ctm/ctm.c
+++ b/rosapps/applications/sysutils/ctm/ctm.c
@@ -277,10 +277,11 @@ void DisplayScreen()
 int ProcessKeys(int numEvents)
 {
        DWORD numChars;
 int ProcessKeys(int numEvents)
 {
        DWORD numChars;

+       TCHAR key;

        if ((ProcessCount-scrolled < 17) && (ProcessCount > 17))
                scrolled = ProcessCount-17;
 
        if ((ProcessCount-scrolled < 17) && (ProcessCount > 17))
                scrolled = ProcessCount-17;
 

-       TCHAR key = GetKeyPressed(numEvents);
+       key = GetKeyPressed(numEvents);

        if (key == KEY_QUIT)
                return TRUE;
        else if (key == KEY_KILL)
        if (key == KEY_QUIT)
                return TRUE;
        else if (key == KEY_KILL)