r=brendan, bug# 34276. Fix for correctly including winsock2.h.

js/src/jsotypes.h

@@ -98,13 +98,11 @@ typedef JSInt64 int64;
 #ifdef HPUX
 #include <model.h>
 #else
-#if !defined(WIN32) || !defined(_WINSOCK2API_)  /* defines its own "int32" */
 #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2)
 typedef JSInt32 int32;
 #else
 typedef long int32;
 #endif
-#endif
 typedef JSInt16 int16;
 typedef JSInt8 int8;
 #endif /* HPUX */