diff --git a/mozilla/js/src/jsatom.c b/mozilla/js/src/jsatom.c
index e2a79d601e3..1198406e808 100644
--- a/mozilla/js/src/jsatom.c
+++ b/mozilla/js/src/jsatom.c
@@ -148,7 +148,7 @@ js_compare_atom_keys(const void *k1, const void *k2)
         double d2 = *JSVAL_TO_DOUBLE(v2);
         if (JSDOUBLE_IS_NaN(d1))
             return JSDOUBLE_IS_NaN(d2);
-#if defined(XP_PC) || defined(XP_OS2)
+#if defined(XP_WIN) || defined(XP_OS2)
         /* XXX MSVC miscompiles such that (NaN == 0) */
         if (JSDOUBLE_IS_NaN(d2))
             return JS_FALSE;
diff --git a/mozilla/js/src/jscpucfg.c b/mozilla/js/src/jscpucfg.c
index 2ad340f0636..f05d81eddff 100644
--- a/mozilla/js/src/jscpucfg.c
+++ b/mozilla/js/src/jscpucfg.c
@@ -55,7 +55,7 @@
 #include <Types.h>
 #define INT64	UnsignedWide
 #else
-#if defined(XP_PC) || defined(XP_OS2)
+#if defined(XP_WIN) || defined(XP_OS2)
 #ifdef WIN32
 #if defined(__GNUC__)
 #define INT64   long long