499218 - nsOggDecoder.cpp compile fails, PR_ASSERT_CURRENT_THREAD_IN_MONITOR undefined

Status: RESOLVED INVALID

(Core :: Audio/Video, defect)

Description

[Jeremy Huddleston]

Build fails using rc1, but it worked with b4

mozilla-1.9.1/content/media/video/src $ sudo make
/opt/local/bin/gmake export
gmake[1]: Entering directory `/opt/local/var/macports/build/_Users_jeremy_src_macports-trunk_dports_devel_xulrunner-devel/work/mozilla-1.9.1/content/media/video/src'
gmake[1]: Nothing to be done for `export'.
gmake[1]: Leaving directory `/opt/local/var/macports/build/_Users_jeremy_src_macports-trunk_dports_devel_xulrunner-devel/work/mozilla-1.9.1/content/media/video/src'
/opt/local/bin/gmake libs
gmake[1]: Entering directory `/opt/local/var/macports/build/_Users_jeremy_src_macports-trunk_dports_devel_xulrunner-devel/work/mozilla-1.9.1/content/media/video/src'
nsOggDecoder.cpp
/usr/bin/g++-4.0 -o nsOggDecoder.o -c -I../../../../dist/include/system_wrappers -include ../../../../config/gcc_hidden.h -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_COM_OBSOLETE -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES  -DOSTYPE=\"Darwin9.7.0\" -DOSARCH=Darwin  -I. -I. -I../../../../dist/include/xpcom -I../../../../dist/include/string -I../../../../dist/include/gfx -I../../../../dist/include/content -I../../../../dist/include/thebes -I../../../../dist/include/layout -I../../../../dist/include/widget -I../../../../dist/include/dom -I../../../../dist/include/js -I../../../../dist/include/locale -I../../../../dist/include/unicharutil -I../../../../dist/include/webshell -I../../../../dist/include/uriloader -I../../../../dist/include/htmlparser -I../../../../dist/include/necko -I../../../../dist/include/view -I../../../../dist/include/pref -I../../../../dist/include/docshell -I../../../../dist/include/xpconnect -I../../../../dist/include/xuldoc -I../../../../dist/include/caps -I../../../../dist/include/editor -I../../../../dist/include/imglib2 -I../../../../dist/include/mimetype -I../../../../dist/include/exthandler -I../../../../dist/include/uconv -I../../../../dist/include/intl -I../../../../dist/include/plugin -I../../../../dist/include/cairo -I../../../../dist/include/libpixman -I../../../../dist/include   -I../../../../dist/include/content -I/opt/local/include/nspr -I/opt/local/include/nss -I/opt/local/include  -I/opt/local/include -I/opt/local/var/macports/build/_Users_jeremy_src_macports-trunk_dports_devel_xulrunner-devel/work/mozilla-1.9.1/dist/sdk/include -I./../../../base/src -I./../../../html/content/src  -I/opt/local/include   -fPIC  -I/opt/local/include  -I/opt/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-long-long -O2 -fno-strict-aliasing -fpascal-strings -fno-common -I/Developer/Headers/FlatCarbon -fshort-wchar -pthread -pipe  -DNDEBUG -DTRIMMED -O2  -I/opt/local/include  -I/opt/local/include -DMOZILLA_CLIENT -include ../../../../mozilla-config.h -Wp,-MD,.deps/nsOggDecoder.pp nsOggDecoder.cpp
nsOggDecoder.cpp: In member function ‘PRBool nsOggDecodeStateMachine::IsBuffering() const’:
nsOggDecoder.cpp:368: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘PRBool nsOggDecodeStateMachine::IsSeeking() const’:
nsOggDecoder.cpp:375: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘PRBool nsOggStepDecodeEvent::InStopDecodingState()’:
nsOggDecoder.cpp:631: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘void nsOggDecodeStateMachine::HandleDecodeErrors(OggPlayErrorCode)’:
nsOggDecoder.cpp:738: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘nsOggDecodeStateMachine::FrameData* nsOggDecodeStateMachine::NextFrame()’:
nsOggDecoder.cpp:753: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘void nsOggDecodeStateMachine::UpdatePlaybackPosition(float)’:
nsOggDecoder.cpp:1116: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
nsOggDecoder.cpp: In member function ‘void nsOggDecodeStateMachine::Seek(float)’:
nsOggDecoder.cpp:1226: warning: unused variable ‘duration’
nsOggDecoder.cpp: In member function ‘void nsOggDecodeStateMachine::StopStepDecodeThread(nsAutoMonitor*)’:
nsOggDecoder.cpp:1381: error: ‘PR_ASSERT_CURRENT_THREAD_IN_MONITOR’ was not declared in this scope
gmake[1]: *** [nsOggDecoder.o] Error 1
gmake[1]: Leaving directory `/opt/local/var/macports/build/_Users_jeremy_src_macports-trunk_dports_devel_xulrunner-devel/work/mozilla-1.9.1/content/media/video/src'
make: *** [default] Error 2

./nsMediaCache.cpp does:
#ifndef PR_ASSERT_CURRENT_THREAD_IN_MONITOR
#define PR_ASSERT_CURRENT_THREAD_IN_MONITOR(m)
#endif

so just add that to nsOggDecoder.cpp as well

Comment 1

[Jeremy Huddleston]

Attachment: nsOggDecoder.patch

Comment 2

[Matthew Gregan [:kinetik]]

Are you using an old NSPR?  PR_ASSERT_CURRENT_THREAD_IN_MONITOR must be in the NSPR we're using to build 1.9.1, otherwise we'd be seeing these failures in nightly builds.

Comment 3

[Jeremy Huddleston]

4.7.4 ... I'll give 4.7.5 a go.

Comment 4

[Jeremy Huddleston]

Nope, it fails with 4.7.5 as well.  PR_ASSERT_CURRENT_THREAD_IN_MONITOR is not defined in nspr-4.7.5.  no-oping the assert seems to be fine here (and it's what is already done in nsMediaCache.cpp)

Comment 5

[Benjamin Smedberg]

Comment on attachment 384016 [details] [diff] [review]
nsOggDecoder.patch

We require the version of NSPR which is in the tree, which definitely does define this macro: http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prmon.h#117

We should fix the configure checks to enforce whatever version of NSPR this appeared in.

Comment 6

[Jeremy Huddleston]

Well, then this workaround should be *REMOVED* from nsMediaCache.cpp

Comment 7

[Matthew Gregan [:kinetik]]

The workaround was removed from trunk's nsMediaCache.cpp.