Bug 656282: Remove redundant declaration that causes an MSVC warning, r=luke
authorDavid Mandelin <dmandelin@mozilla.com>
Mon, 16 May 2011 16:17:19 -0700
changeset 71338 64cd255ac8511c757ff3fa9b6c78de70c59d5893
parent 71337 2781c17e531d5ebf154dc220ca8ba002ad37ece0
child 71339 3476e2f644a8cf01a025a5ec78fab535b9a43a3e
push id45
push userffxbld
push dateThu, 22 Sep 2011 17:29:26 +0000
treeherdermozilla-release@b3273da80b44 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs656282
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 656282: Remove redundant declaration that causes an MSVC warning, r=luke
js/src/jsutil.h
mfbt/Util.h
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -46,23 +46,16 @@
 
 #include "jstypes.h"
 #include "mozilla/Util.h"
 #include <stdlib.h>
 #include <string.h>
 
 JS_BEGIN_EXTERN_C
 
-/*
- * JS_Assert is present even in release builds, for the benefit of applications
- * that build DEBUG and link against a non-DEBUG SpiderMonkey library.
- */
-extern JS_PUBLIC_API(void)
-JS_Assert(const char *s, const char *file, JSIntn ln);
-
 #define JS_CRASH_UNLESS(__cond)                                                 \
     JS_BEGIN_MACRO                                                              \
         if (!(__cond)) {                                                        \
             *(int *)(uintptr_t)0xccadbeef = 0;                                  \
             ((void(*)())0)(); /* More reliable, but doesn't say CCADBEEF */     \
         }                                                                       \
     JS_END_MACRO
 
--- a/mfbt/Util.h
+++ b/mfbt/Util.h
@@ -47,16 +47,19 @@
  * for mfbt /just/ to provide a function like FatalError() to be used
  * by MOZ_ASSERT().  (It'll happen eventually, but for just ASSERT()
  * it isn't worth the pain.)  JS_Assert(), although unfortunately
  * named, is part of SpiderMonkey's stable, external API, so this
  * isn't quite as bad as it seems.
  *
  * Once mfbt needs object files, this unholy union with JS_Assert()
  * will be broken.
+ *
+ * JS_Assert is present even in release builds, for the benefit of applications
+ * that build DEBUG and link against a non-DEBUG SpiderMonkey library.
  */
 MOZ_BEGIN_EXTERN_C
 
 extern MFBT_API(void)
 JS_Assert(const char *s, const char *file, JSIntn ln);
 
 MOZ_END_EXTERN_C