Bug 928220 - Get rid of JS_INLINE
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Tue, 22 Oct 2013 06:34:24 +0900
changeset 165428 0bdd39cd9e6cc64f4bb448d85b93474012be6468
parent 165427 9b0f18ffd8f1af32a9f5c26e99cb013451f60541
child 165429 e5e074ddca9e5fa433a8537898a4a8d093e05d9c
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs928220
milestone27.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 928220 - Get rid of JS_INLINE
js/public/Utility.h
js/src/jsexn.h
js/src/jstypes.h
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -131,41 +131,41 @@ PrintBacktrace()
         } \
     } while (0)
 
 # else
 #  define JS_OOM_POSSIBLY_FAIL() do {} while(0)
 #  define JS_OOM_POSSIBLY_FAIL_REPORT(cx) do {} while(0)
 # endif /* DEBUG */
 
-static JS_INLINE void* js_malloc(size_t bytes)
+static inline void* js_malloc(size_t bytes)
 {
     JS_OOM_POSSIBLY_FAIL();
     return malloc(bytes);
 }
 
-static JS_INLINE void* js_calloc(size_t bytes)
+static inline void* js_calloc(size_t bytes)
 {
     JS_OOM_POSSIBLY_FAIL();
     return calloc(bytes, 1);
 }
 
-static JS_INLINE void* js_calloc(size_t nmemb, size_t size)
+static inline void* js_calloc(size_t nmemb, size_t size)
 {
     JS_OOM_POSSIBLY_FAIL();
     return calloc(nmemb, size);
 }
 
-static JS_INLINE void* js_realloc(void* p, size_t bytes)
+static inline void* js_realloc(void* p, size_t bytes)
 {
     JS_OOM_POSSIBLY_FAIL();
     return realloc(p, bytes);
 }
 
-static JS_INLINE void js_free(void* p)
+static inline void js_free(void* p)
 {
     free(p);
 }
 #endif/* JS_USE_CUSTOM_ALLOCATOR */
 
 /*
  * JS_ROTATE_LEFT32
  *
--- a/js/src/jsexn.h
+++ b/js/src/jsexn.h
@@ -64,17 +64,17 @@ js_GetLocalizedErrorMessage(js::Exclusiv
  * cx must be in the same compartment as scope. errobj may be in a different
  * compartment, but it must be an Error object (not a wrapper of one) and it
  * must not be one of the prototype objects created by js_InitExceptionClasses
  * (errobj->getPrivate() must not be nullptr).
  */
 extern JSObject *
 js_CopyErrorObject(JSContext *cx, js::HandleObject errobj, js::HandleObject scope);
 
-static JS_INLINE JSProtoKey
+static inline JSProtoKey
 GetExceptionProtoKey(int exn)
 {
     JS_ASSERT(JSEXN_ERR <= exn);
     JS_ASSERT(exn < JSEXN_LIMIT);
     return JSProtoKey(JSProto_Error + exn);
 }
 
 #endif /* jsexn_h */
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -84,20 +84,16 @@
 #define JS_FASTCALL __fastcall
 #elif defined(__GNUC__) && defined(__i386__)
 #define JS_FASTCALL __attribute__((fastcall))
 #else
 #define JS_FASTCALL
 #define JS_NO_FASTCALL
 #endif
 
-#ifndef JS_INLINE
-#define JS_INLINE MOZ_INLINE
-#endif
-
 #ifndef JS_ALWAYS_INLINE
 #define JS_ALWAYS_INLINE MOZ_ALWAYS_INLINE
 #endif
 
 #ifndef JS_NEVER_INLINE
 #define JS_NEVER_INLINE MOZ_NEVER_INLINE
 #endif