diff -r 000000000000 -r 6474c204b198 js/src/jswin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jswin.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef jswin_h
+#define jswin_h
+
+/*
+ * This file is a wrapper around <windows.h> to prevent the mangling of
+ * various function names throughout the codebase.
+ */
+
+#ifdef XP_WIN
+# include <windows.h>
+# undef min
+# undef max
+# undef GetProp
+# undef SetProp
+# undef CONST
+# undef STRICT
+# undef LEGACY
+# undef THIS
+# undef PASSTHROUGH
+#endif
+
+#endif /* jswin_h */