wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused XREShellData

Browse source
This commit is contained in:
wolfbeast 2018-05-03 06:28:20 +02:00 • committed by Roy Tam
commit 48c807d319
7 changed files with 5 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/palemoon/app/nsBrowserApp.cpp
View file

@ -202,9 +202,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
argv[i] = argv[i + 1];
}
XREShellData shellData;
return XRE_XPCShellMain(--argc, argv, envp, &shellData);
return XRE_XPCShellMain(--argc, argv, envp);
}
if (appini) {

3
browser/app/nsBrowserApp.cpp
View file

@ -202,8 +202,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
argv[i] = argv[i + 1];
}
XREShellData shellData;
return XRE_XPCShellMain(--argc, argv, envp, &shellData);
return XRE_XPCShellMain(--argc, argv, envp);
}
if (appini) {

4
js/xpconnect/shell/xpcshell.cpp
View file

@ -50,9 +50,7 @@ main(int argc, char** argv, char** envp)
DllBlocklist_Initialize();
#endif
XREShellData shellData;
int result = XRE_XPCShellMain(argc, argv, envp, &shellData);
int result = XRE_XPCShellMain(argc, argv, envp);
#ifdef XP_MACOSX
FinishAutoreleasePool();

5
js/xpconnect/src/XPCShellImpl.cpp
View file

@ -1232,11 +1232,8 @@ GetCurrentWorkingDirectory(nsAString& workingDirectory)
static JSSecurityCallbacks shellSecurityCallbacks;
int
XRE_XPCShellMain(int argc, char** argv, char** envp,
const XREShellData* aShellData)
XRE_XPCShellMain(int argc, char** argv, char** envp)
{
MOZ_ASSERT(aShellData);
JSContext* cx;
int result = 0;
nsresult rv;

17
xpcom/build/XREShellData.h
View file

@ -1,17 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef XREShellData_h
#define XREShellData_h
/**
* Data needed by XRE_XPCShellMain.
*/
struct XREShellData
{
};
#endif // XREShellData_h

1
xpcom/build/moz.build
View file

@ -12,7 +12,6 @@ EXPORTS += [
'nsXULAppAPI.h',
'XREChildData.h',
'xrecore.h',
'XREShellData.h',
]
EXPORTS.mozilla += [

4
xpcom/build/nsXULAppAPI.h
View file

@ -20,7 +20,6 @@
#include "mozilla/Vector.h"
#include "mozilla/TimeStamp.h"
#include "XREChildData.h"
#include "XREShellData.h"
/**
* A directory service key which provides the platform-correct "application
@ -504,8 +503,7 @@ XRE_API(void,
XRE_EnableSameExecutableForContentProc, ())
XRE_API(int,
XRE_XPCShellMain, (int argc, char** argv, char** envp,
const XREShellData* aShellData))
XRE_XPCShellMain, (int argc, char** argv, char** envp))
#if MOZ_WIDGET_GTK == 2
XRE_API(void,