commit 7dde7f47c59541e659eaa482afde10dc2fa397ea
parent 721b1c270b36d869b871fe78269859a33f58b16e
Author: Andrew McCreight <continuation@gmail.com>
Date: Thu, 4 Dec 2025 23:55:02 +0000
Bug 2004131 - Remove XPCOM.h. r=xpcom-reviewers,nika
This doesn't even appear to be used by the one place that includes it.
I built XPCOMInit.cpp in non-unified and it seemed okay.
Differential Revision: https://phabricator.services.mozilla.com/D275120
Diffstat:
3 files changed, 0 insertions(+), 169 deletions(-)
diff --git a/xpcom/build/XPCOM.h b/xpcom/build/XPCOM.h
@@ -1,167 +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 mozilla_XPCOM_h
-#define mozilla_XPCOM_h
-
-// NOTE: the following headers are sorted topologically, not alphabetically.
-// Do not reorder them without review from bsmedberg.
-
-// system headers required by XPCOM headers
-
-#include <string.h>
-
-#ifndef MOZILLA_INTERNAL_API
-# error "MOZILLA_INTERNAL_API must be defined"
-#endif
-
-// core headers required by pretty much everything else
-
-#include "nscore.h"
-
-#include "nsXPCOMCID.h"
-#include "nsXPCOM.h"
-
-#include "nsError.h"
-#include "nsDebug.h"
-
-#include "nsID.h"
-
-#include "nsISupports.h"
-
-#include "nsTArray.h"
-
-#include "nsCOMPtr.h"
-#include "nsCOMArray.h"
-
-#include "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsNativeCharsetUtils.h"
-
-#include "nsISupportsUtils.h"
-#include "nsISupportsImpl.h"
-
-// core data structures
-
-#include "nsTHashtable.h"
-#include "nsHashKeys.h"
-#include "nsBaseHashtable.h"
-#include "nsTHashMap.h"
-#include "nsInterfaceHashtable.h"
-#include "nsClassHashtable.h"
-#include "nsRefPtrHashtable.h"
-
-// interfaces that inherit directly from nsISupports
-
-#include "nsIArray.h"
-#include "nsAtom.h"
-#include "nsICategoryManager.h"
-#include "nsIClassInfo.h"
-#include "nsIComponentManager.h"
-#include "nsIConsoleListener.h"
-#include "nsIConsoleMessage.h"
-#include "nsIConsoleService.h"
-#include "nsIDebug2.h"
-#include "nsIDirectoryEnumerator.h"
-#include "nsIEnvironment.h"
-#include "nsIEventTarget.h"
-#include "nsIException.h"
-#include "nsIFactory.h"
-#include "nsIFile.h"
-#include "nsIINIParser.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsILineInputStream.h"
-#include "nsIObserver.h"
-#include "nsIObserverService.h"
-#include "nsIOutputStream.h"
-#include "nsIProcess.h"
-#include "nsIProperties.h"
-#include "nsIRunnable.h"
-#include "nsISeekableStream.h"
-#include "nsISerializable.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptableInputStream.h"
-#include "nsISimpleEnumerator.h"
-#include "nsIStreamBufferAccess.h"
-#include "nsIStringEnumerator.h"
-#include "nsIStorageStream.h"
-#include "nsISupportsIterators.h"
-#include "nsISupportsPrimitives.h"
-#include "nsISupportsPriority.h"
-#include "nsIThreadManager.h"
-#include "nsITimer.h"
-#include "nsIUUIDGenerator.h"
-#include "nsIUnicharInputStream.h"
-#include "nsIUnicharOutputStream.h"
-#include "nsIUnicharLineInputStream.h"
-#include "nsIVariant.h"
-#include "nsIVersionComparator.h"
-#include "nsIWritablePropertyBag2.h"
-
-// interfaces that include something above
-
-#include "nsIAsyncInputStream.h"
-#include "nsIAsyncOutputStream.h"
-#include "nsIBinaryInputStream.h"
-#include "nsIBinaryOutputStream.h"
-#include "nsIConverterInputStream.h"
-#include "nsIConverterOutputStream.h"
-#include "nsIInputStreamTee.h"
-#include "nsIMultiplexInputStream.h"
-#include "nsIMutableArray.h"
-#include "nsIPersistentProperties2.h"
-#include "nsIStringStream.h"
-#include "nsIThread.h"
-#include "nsIThreadPool.h"
-
-// interfaces that include something above
-
-#include "nsILocalFileWin.h"
-#include "nsIObjectInputStream.h"
-#include "nsIObjectOutputStream.h"
-#include "nsIPipe.h"
-
-#ifdef MOZ_WIDGET_COCOA
-# include "nsILocalFileMac.h"
-#endif
-
-// xpcom/glue utility headers
-
-#include "nsComponentManagerUtils.h"
-#include "nsServiceManagerUtils.h"
-
-#include "nsWeakReference.h"
-
-#include "nsArrayEnumerator.h"
-#include "nsArrayUtils.h"
-#include "nsCRTGlue.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsDeque.h"
-#include "nsEnumeratorUtils.h"
-#include "nsIClassInfoImpl.h"
-#include "mozilla/ModuleUtils.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsINIParser.h"
-#include "nsProxyRelease.h"
-#include "nsTObserverArray.h"
-#include "nsTextFormatter.h"
-#include "nsThreadUtils.h"
-#include "nsVersionComparator.h"
-#include "nsXPTCUtils.h"
-
-// xpcom/base utility headers
-
-#include "nsAutoRef.h"
-#include "nsInterfaceRequestorAgg.h"
-
-// xpcom/io utility headers
-
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsDirectoryServiceUtils.h"
-
-#endif // mozilla_XPCOM_h
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
@@ -15,7 +15,6 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/SharedThreadPool.h"
#include "mozilla/TaskController.h"
-#include "mozilla/XPCOM.h"
#include "mozJSModuleLoader.h"
#include "nsXULAppAPI.h"
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
@@ -22,7 +22,6 @@ EXPORTS.mozilla += [
"Omnijar.h",
"PoisonIOInterposer.h",
"SmallArrayLRUCache.h",
- "XPCOM.h",
"XREAppData.h",
]