diff -urN js/src/jslock.c js.new/src/jslock.c
--- js/src/jslock.c	2008-03-29 14:38:28.000000000 +0100
+++ js.new/src/jslock.c	2012-09-11 15:45:52.011139801 +0200
@@ -979,7 +979,11 @@
     js_ResumeThread(tl);
 }
 
+#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 7)
+inline void
+#else
 JS_INLINE void
+#endif
 js_Lock(JSThinLock *tl, jsword me)
 {
     JS_ASSERT(CURRENT_THREAD_IS_ME(me));
@@ -993,7 +997,11 @@
 #endif
 }
 
+#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 7)
+inline void
+#else
 JS_INLINE void
+#endif
 js_Unlock(JSThinLock *tl, jsword me)
 {
     JS_ASSERT(CURRENT_THREAD_IS_ME(me));