Bug 1426898 - Stop including Char16.h everywhere. r=Waldo

We had to force-include Char16.h to simulate char16_t on older MSVC versions. But it is no longer the case. We should not rebuild the world whenever we touch this file. MozReview-Commit-ID: 1XY7tQD8LoK --HG-- extra : rebase_source : a08ccfc9b6a4abf90f6f8b97a42079865724c9ec
trman · Dec 22, 2017 · a1d349b · a1d349b
1 parent 89dad26
commit a1d349b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/ipc/glue/FileDescriptor.h b/ipc/glue/FileDescriptor.h
@@ -14,6 +14,7 @@
 #ifdef XP_WIN
 // Need the HANDLE typedef.
 #include <winnt.h>
+#include <cstdint>
 #else
 #include "base/file_descriptor_posix.h"
 #endif

diff --git a/media/gmp-clearkey/0.1/WMFUtils.h b/media/gmp-clearkey/0.1/WMFUtils.h
@@ -26,6 +26,7 @@
 #include <mfobjects.h>
 #include <mftransform.h>
 #include <wmcodecdsp.h>
+#include "mozilla/Attributes.h"
 #include "VideoLimits.h"
 
 #include "gmp-platform.h"

diff --git a/mozilla-config.h.in b/mozilla-config.h.in
@@ -37,16 +37,6 @@
 #pragma clang diagnostic pop
 #endif
 
-/*
- * Force-include Char16.h in order to define PRUnichar as char16_t everywhere.
- * Note that this should be the first #include to make sure that prtypes.h does
- * not attempt to define PRUnichar.  This includes the following hunspell-specific
- * includes.
- */
-#if !defined(__ASSEMBLER__)
-#include "mozilla/Char16.h"
-#endif
-
 /*
  * Force-include hunspell_alloc_hooks.h and hunspell_fopen_hooks.h for hunspell,
  * so that we don't need to modify them directly.

diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
@@ -10,6 +10,7 @@
 #error This file only makes sense on Windows.
 #endif
 
+#include "mozilla/Char16.h"
 #include "nsUTF8Utils.h"
 #include <intrin.h>
 #include <math.h>

diff --git a/xpcom/base/nsVersionComparator.h b/xpcom/base/nsVersionComparator.h
@@ -7,6 +7,7 @@
 #ifndef nsVersionComparator_h__
 #define nsVersionComparator_h__
 
+#include "mozilla/Char16.h"
 #include "nscore.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/xpcom/string/nsCharTraits.h b/xpcom/string/nsCharTraits.h
@@ -10,8 +10,6 @@
 #include <ctype.h> // for |EOF|, |WEOF|
 #include <string.h> // for |memcpy|, et al
 
-#include "nscore.h" // for |char16_t|
-
 // This file may be used (through nsUTF8Utils.h) from non-XPCOM code, in
 // particular the standalone software updater. In that case stub out
 // the macros provided by nsDebug.h which are only usable when linking XPCOM

diff --git a/xpcom/string/nsTDependentSubstring.cpp b/xpcom/string/nsTDependentSubstring.cpp
@@ -4,6 +4,8 @@
  * 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 "nsTDependentSubstring.h"
+
 template <typename T>
 void
 nsTDependentSubstring<T>::Rebind(const substring_type& str,

diff --git a/xpcom/string/nsTStringRepr.h b/xpcom/string/nsTStringRepr.h
@@ -9,6 +9,7 @@
 
 #include <type_traits> // std::enable_if
 
+#include "mozilla/Char16.h"
 #include "nsStringFlags.h"
 #include "nsCharTraits.h"