xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Dwight
2009-10-15 16:47:48 -04:00
parent f152047f19 98d994eb51
commit 5696d65d83
7 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripting/engine_spidermonkey.cpp
View File

@@ -1174,7 +1174,7 @@ namespace mongo {
spec->start = boost::posix_time::microsec_clock::local_time();
spec->count = 0;
JS_SetContextPrivate( _context, (void*)spec );
#ifdef SM181
#if defined(SM181) && !defined(XULRUNNER190)
JS_SetOperationCallback( _context, _checkTimeout );
#else
JS_SetBranchCallback( _context, checkTimeout );
@@ -1184,7 +1184,7 @@ namespace mongo {
void uninstallCheckTimeout( int timeoutMs ) {
if ( timeoutMs > 0 ) {
#ifdef SM181
#if defined(SM181) && !defined(XULRUNNER190)
JS_SetOperationCallback( _context , 0 );
#else
JS_SetBranchCallback( _context, 0 );