Bug 1380083 Pull in upstream ICU patch that changes '\' to '/' in #include
Upstream: http://bugs.icu-project.org/trac/changeset/40102
MozReview-Commit-ID: 88aECdijOxr
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/bug-1380083
@@ -0,0 +1,34 @@
+Bug 1380083 Change backslaches to forward slashes. Upstream: http://bugs.icu-project.org/trac/changeset/40102
+
+diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp
+--- a/intl/icu/source/common/putil.cpp
++++ b/intl/icu/source/common/putil.cpp
+@@ -96,25 +96,25 @@
+ # define WIN32_LEAN_AND_MEAN
+ #endif
+ # define VC_EXTRALEAN
+ # define NOUSER
+ # define NOSERVICE
+ # define NOIME
+ # define NOMCX
+ # include <windows.h>
+-# include "unicode\uloc.h"
++# include "unicode/uloc.h"
+ #if U_PLATFORM_HAS_WINUWP_API == 0
+ # include "wintz.h"
+ #else // U_PLATFORM_HAS_WINUWP_API
+ typedef PVOID LPMSG; // TODO: figure out how to get rid of this typedef
+ #include <Windows.Globalization.h>
+ #include <windows.system.userprofile.h>
+-#include <wrl\wrappers\corewrappers.h>
+-#include <wrl\client.h>
++#include <wrl/wrappers/corewrappers.h>
++#include <wrl/client.h>
+
+ using namespace ABI::Windows::Foundation;
+ using namespace Microsoft::WRL;
+ using namespace Microsoft::WRL::Wrappers;
+ #endif
+ #elif U_PLATFORM == U_PF_OS400
+ # include <float.h>
+ # include <qusec.h> /* error code structure */
\ No newline at end of file
--- a/intl/icu/source/common/putil.cpp
+++ b/intl/icu/source/common/putil.cpp
@@ -96,25 +96,25 @@
# define WIN32_LEAN_AND_MEAN
#endif
# define VC_EXTRALEAN
# define NOUSER
# define NOSERVICE
# define NOIME
# define NOMCX
# include <windows.h>
-# include "unicode\uloc.h"
+# include "unicode/uloc.h"
#if U_PLATFORM_HAS_WINUWP_API == 0
# include "wintz.h"
#else // U_PLATFORM_HAS_WINUWP_API
typedef PVOID LPMSG; // TODO: figure out how to get rid of this typedef
#include <Windows.Globalization.h>
#include <windows.system.userprofile.h>
-#include <wrl\wrappers\corewrappers.h>
-#include <wrl\client.h>
+#include <wrl/wrappers/corewrappers.h>
+#include <wrl/client.h>
using namespace ABI::Windows::Foundation;
using namespace Microsoft::WRL;
using namespace Microsoft::WRL::Wrappers;
#endif
#elif U_PLATFORM == U_PF_OS400
# include <float.h>
# include <qusec.h> /* error code structure */
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -67,16 +67,17 @@ svn info $1 | grep -v '^Revision: [[:dig
for patch in \
bug-915735 \
suppress-warnings.diff \
bug-1172609-timezone-recreateDefault.diff \
bug-1198952-workaround-make-3.82-bug.diff \
u_setMemoryFunctions-callconvention-anachronism-msvc.diff \
bug-1373763-convertToPosix-stack-value-out-of-scope.diff \
+ bug-1380083 \
; do
echo "Applying local patch $patch"
patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch
done
topsrcdir=`dirname $0`/../
python ${topsrcdir}/js/src/tests/ecma_6/String/make-normalize-generateddata-input.py $topsrcdir