mozilla-central: changeset 214588:97982a1129a2338a6d5c23cdc1d44fbf077ceb66

author	Lars T Hansen <lhansen@mozilla.com>
	Fri, 07 Nov 2014 12:07:06 +0100
changeset 214588	97982a1129a2338a6d5c23cdc1d44fbf077ceb66
parent 214566	78c290f82f03fd93cba01bbac902320a233b9d59
child 214589	730b160795028dd09c72f7ba3877e2d5515b1e73
push id	27788
push user	ryanvm@gmail.com
push date	Fri, 07 Nov 2014 18:23:58 +0000
treeherder	mozilla-central@c39ff12ad6eb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jandem
bugs	1095282
milestone	36.0a1
first release with	nightly linux32 eb0d3b3c0b22 / 36.0a1 / 20141108030205 / files nightly linux64 eb0d3b3c0b22 / 36.0a1 / 20141108030205 / files nightly mac eb0d3b3c0b22 / 36.0a1 / 20141108030205 / files nightly win32 eb0d3b3c0b22 / 36.0a1 / 20141108030205 / files nightly win64 eb0d3b3c0b22 / 36.0a1 / 20141108030205 / files
last release without	nightly linux32 17e190839086 / 36.0a1 / 20141107030202 / files nightly linux64 17e190839086 / 36.0a1 / 20141107030202 / files nightly mac 17e190839086 / 36.0a1 / 20141107030202 / files nightly win32 17e190839086 / 36.0a1 / 20141107030202 / files nightly win64 17e190839086 / 36.0a1 / 20141107030202 / files

--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1218,17 +1218,19 @@ static const JSStdName builtin_property_
     { EAGER_ATOM(encodeURIComponent), JSProto_String },
 #if JS_HAS_UNEVAL
     { EAGER_ATOM(uneval), JSProto_String },
 #endif
 #ifdef ENABLE_BINARYDATA
     { EAGER_ATOM(SIMD), JSProto_SIMD },
     { EAGER_ATOM(TypedObject), JSProto_TypedObject },
 #endif
+#ifdef ENABLE_SHARED_ARRAY_BUFFER
     { EAGER_ATOM(Atomics), JSProto_Atomics },
+#endif
 
     { 0, JSProto_LIMIT }
 };
 
 #undef EAGER_ATOM
 
 JS_PUBLIC_API(bool)
 JS_ResolveStandardClass(JSContext *cx, HandleObject obj, HandleId id, bool *resolved)