Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2826: Bug fixes for win32.

This commit is contained in:
James Chen 2013-10-31 15:15:52 +08:00
parent 6f978c5cbd
commit f478e2d2a5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -79,6 +79,14 @@ static std::map<int,int> ports_sockets;
// name ~> globals // name ~> globals
static std::map<std::string, js::RootedObject*> globals; static std::map<std::string, js::RootedObject*> globals;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
namespace js {
bool IsInRequest(JSContext* cx)
{
return true;
}
}
#endif
static void ReportException(JSContext *cx) static void ReportException(JSContext *cx)
{ {

2
external/spidermonkey/include/win32/jspubtd.h vendored
View File

@ -16,7 +16,7 @@
#include "jsprototypes.h" #include "jsprototypes.h"
#include "jstypes.h" #include "jstypes.h"
#if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING) || defined(DEBUG) #if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING) || (defined(DEBUG) && !defined(_WIN32))
# define JSGC_TRACK_EXACT_ROOTS # define JSGC_TRACK_EXACT_ROOTS
#endif #endif