Merge Win16 "fixes" from Dogbert4xDevelopment_BRANCH

- Reorder identical code
 - Move scope of local variable
 - ifdef out stderr

js/ref/jsarray.c

@@ -60,11 +60,11 @@
 static JSBool
 IdIsIndex(jsid id, jsuint *indexp)
 {
-    jsuint i;
     JSString *str;
     jschar *cp;
 
     if (JSVAL_IS_INT(id)) {
+	jsuint i;
         i = JSVAL_TO_INT(id);
         if (i < 0)
             return JS_FALSE;

js/ref/jsobj.c

@@ -2451,6 +2451,9 @@ out:
 
 #endif /* JS_HAS_XDR */
 
+/* WIN16 has no stderr! --MLM */
+#if !defined XP_PC || !defined _MSC_VER || _MSC_VER > 800 
+
 #ifdef DEBUG
 
 /* Routines to print out values during debugging. */
@@ -2506,3 +2509,4 @@ void printAtom(JSAtom *atom) {
 
 #endif
 
+#endif

js/ref/jsstr.c

@@ -309,10 +309,10 @@ str_resolve(JSContext *cx, JSObject *obj, jsval id)
 
     if (!JSVAL_IS_INT(id))
 	return JS_TRUE;
+    slot = JSVAL_TO_INT(id);
     str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
     if (!str)
 	return JS_FALSE;
-    slot = JSVAL_TO_INT(id);
     if ((size_t)slot >= str->length)
 	return JS_TRUE;
     return str_resolve1(cx, obj, str, slot);