bug 886526 - remove nsStaticComponents.{h,cpp} r=bsmedberg
authorTrevor Saunders <trev.saunders@gmail.com>
Sat, 15 Jun 2013 05:50:25 -0400
changeset 150437 1488f54606a2516cc65b601ca2a737e014b69292
parent 150436 170101f09b3cc68a607b0315c6cd9ffa9e7a45a0
child 150438 73e06fde62e310f63e0ad0f64565b13b1264b706
push id382
push userakeybl@mozilla.com
push dateMon, 21 Oct 2013 21:47:13 +0000
treeherdermozilla-release@5f1868ee45cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs886526
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 886526 - remove nsStaticComponents.{h,cpp} r=bsmedberg
config/Makefile.in
config/nsStaticComponents.cpp.in
config/nsStaticComponents.h
media/webrtc/signaling/test/mediaconduit_unittests.cpp
media/webrtc/signaling/test/signaling_unittests.cpp
toolkit/library/nsStaticXULComponents.cpp
toolkit/xre/nsAppRunner.cpp
xpcom/build/nsXPComInit.cpp
xpcom/components/nsComponentManager.cpp
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -53,17 +53,16 @@ nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROG
 NSINSTALL_FILES := nsinstall$(HOST_BIN_SUFFIX)
 NSINSTALL_DEST := $(DIST)/bin
 NSINSTALL_TARGET := export
 INSTALL_TARGETS += NSINSTALL
 endif
 
 HEADERS_FILES = \
 	$(DEPTH)/mozilla-config.h \
-	$(srcdir)/nsStaticComponents.h \
 	$(NULL)
 HEADERS_DEST := $(DIST)/include
 HEADERS_TARGET := export
 INSTALL_TARGETS += HEADERS
 
 PYTHON_UNIT_TESTS := $(wildcard $(srcdir)/tests/unit-*.py)
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/config/nsStaticComponents.cpp.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#line 2 "nsStaticComponents.cpp.in"
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
-
-#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
-
-#include "mozilla/ModuleUtils.h"
-#include "nsXPCOM.h"
-#include "nsMemory.h"
-#include "nsStaticComponents.h"
-
-/**
- * Declare an NSGetModule() routine for a generic module.
- */
-#define MODULE(_name) \
-    NSMODULE_DECL(_name);
-
-%MODULE_LIST%
-#line 57 "nsStaticComponents.cpp.in"
-
-#undef MODULE
-
-
-#define MODULE(_name) \
-    &NSMODULE_NAME(_name),
-
-/**
- * The nsStaticModuleInfo
- */
-const mozilla::Module *const *const kPStaticModules[] = {
-	%MODULE_LIST%
-#line 70 "nsStaticComponents.cpp.in"
-        NULL
-};
deleted file mode 100644
--- a/config/nsStaticComponents.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 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 nsStaticComponents_h__
-#define nsStaticComponents_h__
-
-#include "mozilla/Module.h"
-
-// These symbols are provided by nsStaticComponents.cpp, and also by other
-// static component providers such as nsStaticXULComponents (libxul).
-
-extern mozilla::Module const *const *const kPStaticModules[];
-
-#endif
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -8,17 +8,16 @@
 #include <unistd.h>
 #include <vector>
 
 using namespace std;
 
 #include "mozilla/Scoped.h"
 #include <MediaConduitInterface.h>
 #include "nsIEventTarget.h"
-#include "nsStaticComponents.h"
 #include "FakeMediaStreamsImpl.h"
 
 #define GTEST_HAS_RTTI 0
 #include "gtest/gtest.h"
 #include "gtest_utils.h"
 
 #include "mtransport_test_utils.h"
 MtransportTestUtils *test_utils;
--- a/media/webrtc/signaling/test/signaling_unittests.cpp
+++ b/media/webrtc/signaling/test/signaling_unittests.cpp
@@ -19,17 +19,16 @@
 #include "ssl.h"
 #include "prthread.h"
 
 #include "FakeMediaStreams.h"
 #include "FakeMediaStreamsImpl.h"
 #include "PeerConnectionImpl.h"
 #include "PeerConnectionCtx.h"
 #include "runnable_utils.h"
-#include "nsStaticComponents.h"
 #include "nsServiceManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsIIOService.h"
 #include "nsIDNSService.h"
 #include "nsWeakReference.h"
 #include "nricectx.h"
 #include "mozilla/SyncRunnable.h"
 
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -1,16 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
 
 #include "mozilla/Module.h"
 #include "nsXPCOM.h"
-#include "nsStaticComponents.h"
 #include "nsMemory.h"
 
 #ifdef MOZ_AUTH_EXTENSION
 #define AUTH_MODULE    MODULE(nsAuthModule)
 #else
 #define AUTH_MODULE
 #endif
 
@@ -241,14 +240,14 @@
 
 XUL_MODULES
 
 #undef MODULE
 
 #define MODULE(_name) \
     &NSMODULE_NAME(_name),
 
-const mozilla::Module *const *const kPStaticModules[] = {
+extern const mozilla::Module *const *const kPStaticModules[] = {
   XUL_MODULES
   NULL
 };
 
 #undef MODULE
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -114,17 +114,16 @@ using mozilla::scache::StartupCache;
 
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsEmbedCID.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
-#include "nsStaticComponents.h"
 #include "nsXPCOM.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsXPIDLString.h"
 #include "nsPrintfCString.h"
 #include "nsVersionComparator.h"
 
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsXULAppAPI.h"
--- a/xpcom/build/nsXPComInit.cpp
+++ b/xpcom/build/nsXPComInit.cpp
@@ -8,17 +8,16 @@
 
 #include "mozilla/Poison.h"
 #include "mozilla/XPCOM.h"
 #include "nsXULAppAPI.h"
 
 #include "nsXPCOMPrivate.h"
 #include "nsXPCOMCIDInternal.h"
 
-#include "nsStaticComponents.h"
 #include "prlink.h"
 
 #include "nsCycleCollector.h"
 #include "nsObserverList.h"
 #include "nsObserverService.h"
 #include "nsProperties.h"
 #include "nsPersistentProperties.h"
 #include "nsScriptableInputStream.h"
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -44,17 +44,16 @@
 #include "nsISimpleEnumerator.h"
 #include "nsIStringEnumerator.h"
 #include "nsXPCOM.h"
 #include "nsXPCOMPrivate.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIClassInfo.h"
 #include "nsLocalFile.h"
 #include "nsReadableUtils.h"
-#include "nsStaticComponents.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
 #include "prcmon.h"
 #include "xptinfo.h" // this after nsISupports, to pick up IID so that xpt stuff doesn't try to define it itself...
 #include "nsThreadUtils.h"
 #include "prthread.h"
 #include "private/pprthred.h"
 #include "nsTArray.h"
@@ -74,16 +73,20 @@
 #include "mozilla/Omnijar.h"
 
 #include "prlog.h"
 
 using namespace mozilla;
 
 PRLogModuleInfo* nsComponentManagerLog = nullptr;
 
+// defined in nsStaticXULComponents.cpp to contain all the components in
+// libxul.
+extern mozilla::Module const *const *const kPStaticModules[];
+
 #if 0 || defined (DEBUG_timeless)
  #define SHOW_DENIED_ON_SHUTDOWN
  #define SHOW_CI_ON_EXISTING_SERVICE
 #endif
 
 // Bloated registry buffer size to improve startup performance -- needs to
 // be big enough to fit the entire file into memory or it'll thrash.
 // 512K is big enough to allow for some future growth in the registry.