Bug 1380083 Pull in upstream ICU patch that changes '\' to '/' in #include draft
authorTom Ritter <tom@mozilla.com>
Wed, 12 Jul 2017 12:30:57 -0500
changeset 607651 c444f0d542a0129f0445389c680b3e79d20a5b15
parent 607015 5820303fb87c57c6229394e07a0707b63049de6e
child 637111 dac398e30b90513bfe0c66b32b44505031c76c26
push id68071
push userbmo:tom@mozilla.com
push dateWed, 12 Jul 2017 17:32:10 +0000
bugs1380083, 40102
milestone56.0a1
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
intl/icu-patches/bug-1380083
intl/icu/source/common/putil.cpp
intl/update-icu.sh
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/bug-1380083
@@ -0,0 +1,62 @@
+diff --git a/intl/icu-patches/bug-1380083 b/intl/icu-patches/bug-1380083
+--- a/intl/icu-patches/bug-1380083
++++ b/intl/icu-patches/bug-1380083
+@@ -1,26 +0,0 @@
+-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
+-@@ -103,18 +103,18 @@
+- #   include <windows.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 */
+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 */
--- 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