Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

83561, r=dveditz, calling convention correctness fix

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@206296 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2006-08-01 15:46:06 +00:00
parent 9ccf7b98c8
commit 1fb11162df
8 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
View File

@@ -86,14 +86,14 @@ extern nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global,
extern nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype);
// Defined in this file:
PR_STATIC_CALLBACK(void) XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
JS_STATIC_DLL_CALLBACK(void) XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
static PRInt32 GetInstallScriptFromJarfile(nsIZipReader* hZip, char** scriptBuffer, PRUint32 *scriptLength);
static PRInt32 OpenAndValidateArchive(nsIZipReader* hZip, nsIFile* jarFile, nsIPrincipal* aPrincipal);
static nsresult SetupInstallContext(nsIZipReader* hZip, nsIFile* jarFile, const PRUnichar* url, const PRUnichar* args,
PRUint32 flags, CHROMEREG_IFACE* reg, JSRuntime *jsRT, JSContext **jsCX, JSObject **jsGlob);
extern "C" void RunInstallOnThread(void *data);
extern "C" void PR_CALLBACK RunInstallOnThread(void *data);
nsresult VerifySigning(nsIZipReader* hZip, nsIPrincipal* aPrincipal)
@@ -456,7 +456,7 @@ PRInt32 RunInstall(nsInstallInfo *installInfo)
// Return type : extern "C"
// Argument : void *data
///////////////////////////////////////////////////////////////////////////////////////////////
extern "C" void RunInstallOnThread(void *data)
extern "C" void PR_CALLBACK RunInstallOnThread(void *data)
{
nsInstallInfo *installInfo = (nsInstallInfo*)data;
@@ -624,7 +624,7 @@ extern "C" void RunInstallOnThread(void *data)
// How do we get it there? Maybe just alerts on errors, could also dump to
// the new console service.
//-----------------------------------------------------------------------------
extern "C" void RunChromeInstallOnThread(void *data)
extern "C" void PR_CALLBACK RunChromeInstallOnThread(void *data)
{
nsresult rv;