diff --git a/Makefile.in b/Makefile.in index febccd5ecb1e..6292d5b349ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,7 +35,7 @@ GARBAGE_DIRS += config.statusd DIST_GARBAGE = config.cache config.log config.status config-defs.h \ config/autoconf.mk \ mozilla-config.h \ - xpcom/xpcom-config.h xpcom/xpcom-private.h \ + xpcom/xpcom-config.h \ .mozconfig.mk ifneq (mobile/android,$(MOZ_BUILD_APP)) diff --git a/xpcom/components/nsComponentManager.h b/xpcom/components/nsComponentManager.h index 3f906b68ad36..51b041ba8dc8 100644 --- a/xpcom/components/nsComponentManager.h +++ b/xpcom/components/nsComponentManager.h @@ -9,7 +9,6 @@ #include "nsXPCOM.h" -#include "xpcom-private.h" #include "nsIComponentManager.h" #include "nsIComponentRegistrar.h" #include "nsIMemoryReporter.h" diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp index 17f0648dbca1..c36c7b7291ab 100644 --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp @@ -38,7 +38,6 @@ # endif #endif -#include "xpcom-private.h" #include "nsDirectoryServiceDefs.h" #include "nsCRT.h" #include "nsCOMPtr.h" diff --git a/xpcom/io/nsNativeCharsetUtils.cpp b/xpcom/io/nsNativeCharsetUtils.cpp index 5184c47f503b..847ae3666c1e 100644 --- a/xpcom/io/nsNativeCharsetUtils.cpp +++ b/xpcom/io/nsNativeCharsetUtils.cpp @@ -4,8 +4,6 @@ * 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 "xpcom-private.h" - //----------------------------------------------------------------------------- // Non-Windows //----------------------------------------------------------------------------- diff --git a/xpcom/moz.build b/xpcom/moz.build index b62fdaf3e828..c12a9e329b34 100644 --- a/xpcom/moz.build +++ b/xpcom/moz.build @@ -40,7 +40,6 @@ TEST_DIRS += [ CONFIGURE_DEFINE_FILES += [ 'xpcom-config.h', - 'xpcom-private.h', ] EXPORTS += [ diff --git a/xpcom/xpcom-private.h.in b/xpcom/xpcom-private.h.in deleted file mode 100644 index d089d1ec5076..000000000000 --- a/xpcom/xpcom-private.h.in +++ /dev/null @@ -1,38 +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/. */ - -/* The following defines are only used by the xpcom implementation */ - -#ifndef _XPCOM_PRIVATE_H_ -#define _XPCOM_PRIVATE_H_ - -/* Define if getpagesize() is available */ -#undef HAVE_GETPAGESIZE - -/* Define if statvfs64() is available */ -#undef HAVE_STATVFS64 - -/* Define if statvfs() is available */ -#undef HAVE_STATVFS - -/* Define if statfs64() is available */ -#undef HAVE_STATFS64 - -/* Define if statfs() is available */ -#undef HAVE_STATFS - -/* Define if is present */ -#undef HAVE_SYS_STATVFS_H - -/* Define if is present */ -#undef HAVE_SYS_STATFS_H - -/* Define if is present */ -#undef HAVE_SYS_VFS_H - -/* Define if is present */ -#undef HAVE_SYS_MOUNT_H - -#endif /* _XPCOM_PRIVATE_H_ */ -