Bug 381236: static assert that does not depend on __LINE__

js/src/jsutil.h

@@ -69,15 +69,11 @@ JS_Assert(const char *s, const char *file, JSIntn ln);
 
 /*
  * Compile-time assert. "condition" must be a constant expression.
- * The macro should be used only once per source line in places where
+ * The macro can be used only in places where an "extern" declaration is
- * a "typedef" declaration is allowed.
+ * allowed.
  */
 #define JS_STATIC_ASSERT(condition)                                           \
-    JS_STATIC_ASSERT_IMPL(condition, __LINE__)
+    extern void js_static_assert(int arg[(condition) ? 1 : -1])
-#define JS_STATIC_ASSERT_IMPL(condition, line)                                \
-    JS_STATIC_ASSERT_IMPL2(condition, line)
-#define JS_STATIC_ASSERT_IMPL2(condition, line)                               \
-    typedef int js_static_assert_line_##line[(condition) ? 1 : -1]
 
 /*
 ** Abort the process in a non-graceful manner. This will cause a core file,