Commit b2f5ffef authored by blythe%netscape.com's avatar blythe%netscape.com
Browse files

fix build bustage caused by recent checkin

parent 3261f0a3

xpcom/base/nsStackFrameWin.h

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ extern SYMUNDNAME _SymUnDName; 
typedef DWORD ( __stdcall *SYMGETMODULEINFO)( HANDLE, DWORD, PIMAGEHLP_MODULE);

extern  SYMGETMODULEINFO _SymGetModuleInfo;



typedef BOOL ( __stdcall *ENUMLOADEDMODULES)( HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID);

extern  ENUMLOADEDMODULES _EnumerateLoadedModules;



PRBool EnsureSymInitialized();



/*

xpcom/base/nsTraceRefcnt.cpp

+6 −1
Original line number Diff line number Diff line
@@ -880,6 +880,8 @@ SYMUNDNAME _SymUnDName; 


SYMGETMODULEINFO _SymGetModuleInfo;



ENUMLOADEDMODULES _EnumerateLoadedModules;



PR_END_EXTERN_C



static PRBool
@@ -918,6 +920,9 @@ EnsureImageHlpInitialized() 
    _SymGetModuleInfo = (SYMGETMODULEINFO)GetProcAddress(module, "SymGetModuleInfo");

    if (!_SymGetModuleInfo) return PR_FALSE;



    _EnumerateLoadedModules = (ENUMLOADEDMODULES)GetProcAddress(module, "EnumerateLoadedModules");

    if (!_EnumerateLoadedModules) return PR_FALSE;



    gInitialized = PR_TRUE;

  }
@@ -984,7 +989,7 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo 
         * Not loaded, here's the magic.

         * Go through all the modules.

         */

        enumRes = EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr);

        enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr);

        if(FALSE != enumRes)

        {

            /*

xpcom/base/nsTraceRefcntImpl.cpp

+6 −1
Original line number Diff line number Diff line
@@ -880,6 +880,8 @@ SYMUNDNAME _SymUnDName; 


SYMGETMODULEINFO _SymGetModuleInfo;



ENUMLOADEDMODULES _EnumerateLoadedModules;



PR_END_EXTERN_C



static PRBool
@@ -918,6 +920,9 @@ EnsureImageHlpInitialized() 
    _SymGetModuleInfo = (SYMGETMODULEINFO)GetProcAddress(module, "SymGetModuleInfo");

    if (!_SymGetModuleInfo) return PR_FALSE;



    _EnumerateLoadedModules = (ENUMLOADEDMODULES)GetProcAddress(module, "EnumerateLoadedModules");

    if (!_EnumerateLoadedModules) return PR_FALSE;



    gInitialized = PR_TRUE;

  }
@@ -984,7 +989,7 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo 
         * Not loaded, here's the magic.

         * Go through all the modules.

         */

        enumRes = EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr);

        enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr);

        if(FALSE != enumRes)

        {

            /*