firefox-7.0.1 build fails: error: expected `)' before 'JSGCRootMapFun'

[Yuri]

Trying to rebuild firefox-7.0.1 on 8.2-STABLE amd64, getting these errors.

See log below.

Thanks,
Yuri


c++ -o nsPluginTags.o -c -I../../../dist/stl_wrappers 
-I../../../dist/system_wrappers -include ../../../config/gcc_hidden.h 
-D_IMPL_NS_LAYOUT -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 
-DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API 
-D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET 
-DIMPL_THEBES  -DSTATIC_EXPORTABLE_JS_API -DOSTYPE=\"FreeBSD8\" 
-DOSARCH=FreeBSD -DEXCLUDE_SKIA_DEPENDENCIES -DCHROMIUM_MOZILLA_BUILD  
-DOS_LINUX=1 -DOS_POSIX=1  -I../../../xpcom/base/ -D_THREAD_SAFE 
-D_REENTRANT -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 
-I/usr/local/include/pixman-1 -I/usr/local/include 
-I/usr/local/include/freetype2 -I/usr/local/include/drm   -D_THREAD_SAFE 
-D_REENTRANT -I/usr/local/include/cairo -I/usr/local/include 
-I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1 
-I/usr/local/include/freetype2 -I/usr/local/include/drm    
-I../../../dom/base -I../../../dom/src/events -I../../../dom/src/storage 
-I../../../dom/src/offline -I../../../dom/src/geolocation 
-I../../../dom/src/notification -I../../../dom/src/threads 
-I../../../content/xbl/src -I../../../content/xul/document/src 
-I../../../content/events/src -I../../../content/base/src 
-I../../../content/html/content/src -I../../../content/html/document/src 
-I../../../content/svg/content/src -I../../../layout/generic 
-I../../../layout/style -I../../../layout/xul/base/src 
-I../../../layout/xul/base/src/tree/src -I../../../ipc/chromium/src 
-I../../../ipc/glue -I../../../ipc/ipdl/_ipdlheaders  -I. -I. 
-I../../../dist/include -I../../../dist/include/nsprpub  
-I/usr/local/include/nspr 
-I/usr/ports/www/firefox/work/mozilla-release/dist/include/nss       
-fPIC -I/usr/local/include -fno-rtti -fno-exceptions -Wall 
-Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy 
-Wno-non-virtual-dtor -Wcast-align -Wno-invalid-offsetof 
-Wno-variadic-macros -Werror=return-type -O2 -pipe -O2 
-fno-strict-aliasing -O2 -ffunction-sections -fdata-sections 
-fno-strict-aliasing -fshort-wchar -pipe -DNDEBUG -DTRIMMED -O2 
-D_THREAD_SAFE -D_REENTRANT -I/usr/local/include/gtk-2.0 
-I/usr/local/lib/gtk-2.0/include -I/usr/local/include/atk-1.0 
-I/usr/local/include/cairo -I/usr/local/include/gdk-pixbuf-2.0 
-I/usr/local/include/pango-1.0 -I/usr/local/include/gio-unix-2.0/ 
-I/usr/local/include -I/usr/local/include/glib-2.0 
-I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 
-I/usr/local/include/drm -I/usr/local/include/gtk-unix-print-2.0    
-I/usr/local/include -DMOZILLA_CLIENT -include ../../../mozilla-config.h 
/usr/ports/www/firefox/work/mozilla-release/dom/plugins/base/nsPluginTags.cpp
In file included from 
/usr/ports/www/firefox/work/mozilla-release/dom/plugins/base/nsNPAPIPlugin.h:45,
                  from 
/usr/ports/www/firefox/work/mozilla-release/dom/plugins/base/nsNPAPIPluginInstance.cpp:46:
/usr/local/include/jsapi.h:827: error: expected `)' before 'JSGCRootMapFun'
/usr/local/include/jsapi.h:830: error: 'JSGCRootMapFun' has not been 
declared
/usr/local/include/jsapi.h:959: error: 'JSGetObjectOps' does not name a type
/usr/local/include/jsapi.h:965: error: 'JSMarkOp' does not name a type
/usr/local/include/jsapi.h:966: error: 'JSReserveSlotsOp' does not name 
a type
/usr/local/include/jsapi.h:972: error: 'JSObjectOp' does not name a type
/usr/local/include/jsapi.h:973: error: 'JSObjectOp' does not name a type
/usr/local/include/jsapi.h:1048: error: 'JSNewObjectMapOp' does not name 
a type
/usr/local/include/jsapi.h:1049: error: 'JSObjectMapOp' does not name a type
/usr/local/include/jsapi.h:1050: error: 'JSLookupPropOp' does not name a 
type
/usr/local/include/jsapi.h:1051: error: 'JSDefinePropOp' does not name a 
type
/usr/local/include/jsapi.h:1052: error: 'JSPropertyIdOp' does not name a 
type
...