Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure consistent definition of OO_NEW_JS.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4145 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-01-24 19:39:45 +00:00
parent 2fba6d4acb
commit 8fba230594
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Debug/OODebugMonitor.m
View File

@ -202,7 +202,15 @@ static OODebugMonitor *sSingleton = nil;
- (oneway void)performJSConsoleCommand:(in NSString *)command - (oneway void)performJSConsoleCommand:(in NSString *)command
{ {
OOJSStartTimeLimiterWithTimeLimit(kOOJSLongTimeLimit); OOJSStartTimeLimiterWithTimeLimit(kOOJSLongTimeLimit);
[_script doEvent:OOJSID("consolePerformJSCommand") withArguments:[NSArray arrayWithObject:command]];
int x = __builtin_choose_expr(__builtin_types_compatible_p(OOJSPropID, const char *), 0, "");
static jsid idCache;
static BOOL inited;
if (EXPECT_NOT(!inited)) OOJSInitPropIDCachePRIVATE("consolePerformJSCommand", &idCache, &inited);
OOJSPropID propID = idCache;
[_script doEvent:propID withArguments:[NSArray arrayWithObject:command]];
OOJSStopTimeLimiter(); OOJSStopTimeLimiter();
} }

5
src/Core/Scripting/OOJSPropID.h
View File

@ -8,6 +8,11 @@
#import <jsapi.h> #import <jsapi.h>
#ifndef OO_NEW_JS
#define OO_NEW_JS 0
#endif
#if OO_NEW_JS #if OO_NEW_JS
typedef jsid OOJSPropID; typedef jsid OOJSPropID;
#else #else