Bug 1155838 - Fix a build warning on windows; r=till

--HG--
extra : rebase_source : ddb1a54e08972dd6508da78f2747bcc60e188510

js/src/builtin/SelfHostingDefines.h

@@ -14,13 +14,6 @@
 #define TO_UINT32(x) ((x) >>> 0)
 #define IS_UINT32(x) ((x) >>> 0 === (x))
 
-// Assertions.
-#ifdef DEBUG
-#define assert(b, info) if (!(b)) AssertionFailed(info)
-#else
-#define assert(b, info) // Elided assertion.
-#endif
-
 // Unforgeable versions of ARRAY.push(ELEMENT) and ARRAY.slice.
 #define ARRAY_PUSH(ARRAY, ELEMENT) \
   callFunction(std_Array_push, ARRAY, ELEMENT);

js/src/builtin/Utilities.js

@@ -26,6 +26,14 @@
 
 #include "SelfHostingDefines.h"
 
+// Assertions, defined here instead of in the header above to make `assert`
+// invisible to C++.
+#ifdef DEBUG
+#define assert(b, info) if (!(b)) AssertionFailed(info)
+#else
+#define assert(b, info) // Elided assertion.
+#endif
+
 // All C++-implemented standard builtins library functions used in self-hosted
 // code are installed via the std_functions JSFunctionSpec[] in
 // SelfHosting.cpp.

js/src/jswin.h

@@ -14,6 +14,7 @@
 
 #ifdef XP_WIN
 # include <windows.h>
+# undef assert
 # undef min
 # undef max
 # undef GetProp