griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix JS_THREADSAFE redefinitions (it's defined by the build system now)

Browse Source 
This was SVN commit r7231.
This commit is contained in:
Ykkrosh 2009-12-28 17:07:29 +00:00
parent 00409b9583
commit fe92d524d6
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/tools/atlas/AtlasScript/ScriptInterface.h
View File

@ -24,16 +24,14 @@
# define XP_UNIX
#endif // (we don't support XP_OS2 or XP_BEOS)
// NOTE: This requires a threadsafe SpiderMonkey - make sure you compile it with
// the right options, else it'll fail when linking (which might not be until runtime,
// and then you'll wish you saw this comment before spending so much time investigating
// the problem).
// ((There are a few places where SM really needs to be told to be threadsafe, even
// though we're not actually sharing runtimes between threads.))
#define JS_THREADSAFE
#include "js/jspubtd.h"
#ifndef JS_THREADSAFE
#error The editor requires a threadsafe version of SpiderMonkey. Something in the build system is broken if you see this error.
#endif
// (There are a few places where SM really needs to be told to be threadsafe, even
// though we're not actually sharing runtimes between threads.)
class wxWindow;
class wxString;
class wxPanel;

2
source/tools/atlas/wxJS/precompiled.h
View File

@ -9,8 +9,6 @@
# define XP_UNIX
#endif // (we don't support XP_OS2 or XP_BEOS)
#define JS_THREADSAFE
#ifdef _WIN32
# pragma warning (disable: 4100) // "unreferenced formal parameter"