diff options
| -rw-r--r-- | application/palemoon/app/nsBrowserApp.cpp | 4 | ||||
| -rw-r--r-- | browser/app/nsBrowserApp.cpp | 3 | ||||
| -rw-r--r-- | js/xpconnect/shell/xpcshell.cpp | 4 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCShellImpl.cpp | 5 | ||||
| -rw-r--r-- | xpcom/build/XREShellData.h | 17 | ||||
| -rw-r--r-- | xpcom/build/moz.build | 1 | ||||
| -rw-r--r-- | xpcom/build/nsXULAppAPI.h | 4 |
7 files changed, 5 insertions, 33 deletions
diff --git a/application/palemoon/app/nsBrowserApp.cpp b/application/palemoon/app/nsBrowserApp.cpp index 3951033d7..8b0613528 100644 --- a/application/palemoon/app/nsBrowserApp.cpp +++ b/application/palemoon/app/nsBrowserApp.cpp @@ -197,9 +197,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) { diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 193de46cf..66ea8aed5 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -197,8 +197,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) { diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp index 4521dc52f..4eef3f6bf 100644 --- a/js/xpconnect/shell/xpcshell.cpp +++ b/js/xpconnect/shell/xpcshell.cpp @@ -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(); diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index f6c74f9b2..a6432856d 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -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; diff --git a/xpcom/build/XREShellData.h b/xpcom/build/XREShellData.h deleted file mode 100644 index f734b1d74..000000000 --- a/xpcom/build/XREShellData.h +++ /dev/null @@ -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 diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index 68bd001a2..e0adba0a2 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -12,7 +12,6 @@ EXPORTS += [ 'nsXULAppAPI.h', 'XREChildData.h', 'xrecore.h', - 'XREShellData.h', ] EXPORTS.mozilla += [ diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h index aae248ca1..c077c7e36 100644 --- a/xpcom/build/nsXULAppAPI.h +++ b/xpcom/build/nsXULAppAPI.h @@ -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, |