diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2011-08-19 18:09:18 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2011-08-21 01:34:54 -0400 |
| commit | d40cad9feb14c0a2be44ddbe693a178181c4dbb1 (patch) | |
| tree | 9abee1bef979ea3946dfcdea461549de74f64989 /scripting | |
| parent | f33cd59e7439f886681ff0b145fcb592187dc217 (diff) | |
| download | mongo-d40cad9feb14c0a2be44ddbe693a178181c4dbb1.tar.gz | |
combine sm in source
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/engine_spidermonkey.h | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/scripting/engine_spidermonkey.h b/scripting/engine_spidermonkey.h index 0554adbf836..9fd430d853d 100644 --- a/scripting/engine_spidermonkey.h +++ b/scripting/engine_spidermonkey.h @@ -21,18 +21,6 @@ // START inc hacking -#if defined( MOZJS ) - -#define MOZILLA_1_8_BRANCH - -#include "mozjs/jsapi.h" -#include "mozjs/jsdate.h" -#include "mozjs/jsregexp.h" - -#warning if you are using an ubuntu version of spider monkey, we recommend installing spider monkey from source - -#elif defined( OLDJS ) - #ifdef WIN32 #include "jstypes.h" #undef JS_PUBLIC_API @@ -46,30 +34,11 @@ #include "jsdate.h" #include "jsregexp.h" -#else - -#include "js/jsapi.h" -#include "js/jsobj.h" -#include "js/jsdate.h" -#include "js/jsregexp.h" - -#endif - // END inc hacking // -- SM 1.6 hacks --- #ifndef JSCLASS_GLOBAL_FLAGS - -#warning old version of spider monkey ( probably 1.6 ) you should upgrade to at least 1.7 - -#define JSCLASS_GLOBAL_FLAGS 0 - -JSBool JS_CStringsAreUTF8() { - return false; -} - -#define SM16 - +#error old version of spider monkey ( probably 1.6 ) you should upgrade to at least 1.7 #endif // -- END SM 1.6 hacks --- |