forked from 0ad/0ad
Fix JS_THREADSAFE redefinitions (it's defined by the build system now)
This was SVN commit r7231.
This commit is contained in:
parent
00409b9583
commit
fe92d524d6
@ -24,16 +24,14 @@
|
|||||||
# define XP_UNIX
|
# define XP_UNIX
|
||||||
#endif // (we don't support XP_OS2 or XP_BEOS)
|
#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"
|
#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 wxWindow;
|
||||||
class wxString;
|
class wxString;
|
||||||
class wxPanel;
|
class wxPanel;
|
||||||
|
@ -9,8 +9,6 @@
|
|||||||
# define XP_UNIX
|
# define XP_UNIX
|
||||||
#endif // (we don't support XP_OS2 or XP_BEOS)
|
#endif // (we don't support XP_OS2 or XP_BEOS)
|
||||||
|
|
||||||
#define JS_THREADSAFE
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# pragma warning (disable: 4100) // "unreferenced formal parameter"
|
# pragma warning (disable: 4100) // "unreferenced formal parameter"
|
||||||
|
Loading…
Reference in New Issue
Block a user