From 0c7676f78d344853c978e28a2a17828f4bc5b8b0 Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Thu, 21 May 2015 08:03:48 -0400
Subject: [PATCH] Bug 1135583: Prevent the inclusion of Char16.h in VS2015's
 fallible.obj. r=glandium

--HG--
extra : rebase_source : 1d1e1c9918461d692996d27becc857e60caaebd0
---
 memory/fallible/moz.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/memory/fallible/moz.build b/memory/fallible/moz.build
index 5ef8fe0bbada..22d17becea46 100644
--- a/memory/fallible/moz.build
+++ b/memory/fallible/moz.build
@@ -28,3 +28,8 @@ if CONFIG['_MSC_VER']:
     CXXFLAGS += [
         '-Zl',
     ]
+
+    if CONFIG['_MSC_VER'] >= '1900':
+        # This further prevents the CRT name from getting into the .obj file,
+        # by avoiding pulling in a bunch of string code that uses the CRT.
+        DEFINES['mozilla_Char16_h'] = True