Skip to content

Commit a1d349b

Browse files
committed
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
1 parent 89dad26 commit a1d349b

File tree

8 files changed

+7
-12
lines changed

8 files changed

+7
-12
lines changed

ipc/glue/FileDescriptor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#ifdef XP_WIN
1515
// Need the HANDLE typedef.
1616
#include <winnt.h>
17+
#include <cstdint>
1718
#else
1819
#include "base/file_descriptor_posix.h"
1920
#endif

media/gmp-clearkey/0.1/WMFUtils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <mfobjects.h>
2727
#include <mftransform.h>
2828
#include <wmcodecdsp.h>
29+
#include "mozilla/Attributes.h"
2930
#include "VideoLimits.h"
3031

3132
#include "gmp-platform.h"

mozilla-config.h.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@
3737
#pragma clang diagnostic pop
3838
#endif
3939

40-
/*
41-
* Force-include Char16.h in order to define PRUnichar as char16_t everywhere.
42-
* Note that this should be the first #include to make sure that prtypes.h does
43-
* not attempt to define PRUnichar. This includes the following hunspell-specific
44-
* includes.
45-
*/
46-
#if !defined(__ASSEMBLER__)
47-
#include "mozilla/Char16.h"
48-
#endif
49-
5040
/*
5141
* Force-include hunspell_alloc_hooks.h and hunspell_fopen_hooks.h for hunspell,
5242
* so that we don't need to modify them directly.

toolkit/xre/nsWindowsWMain.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#error This file only makes sense on Windows.
1111
#endif
1212

13+
#include "mozilla/Char16.h"
1314
#include "nsUTF8Utils.h"
1415
#include <intrin.h>
1516
#include <math.h>

xpcom/base/nsVersionComparator.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef nsVersionComparator_h__
88
#define nsVersionComparator_h__
99

10+
#include "mozilla/Char16.h"
1011
#include "nscore.h"
1112
#include <stdlib.h>
1213
#include <string.h>

xpcom/string/nsCharTraits.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include <ctype.h> // for |EOF|, |WEOF|
1111
#include <string.h> // for |memcpy|, et al
1212

13-
#include "nscore.h" // for |char16_t|
14-
1513
// This file may be used (through nsUTF8Utils.h) from non-XPCOM code, in
1614
// particular the standalone software updater. In that case stub out
1715
// the macros provided by nsDebug.h which are only usable when linking XPCOM

xpcom/string/nsTDependentSubstring.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
66

7+
#include "nsTDependentSubstring.h"
8+
79
template <typename T>
810
void
911
nsTDependentSubstring<T>::Rebind(const substring_type& str,

xpcom/string/nsTStringRepr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <type_traits> // std::enable_if
1111

12+
#include "mozilla/Char16.h"
1213
#include "nsStringFlags.h"
1314
#include "nsCharTraits.h"
1415

0 commit comments

Comments
 (0)