From dde8a1fac6599598c7ae5338b25602fa838b99ec Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sun, 23 Dec 2012 04:22:22 +0000
Subject: [PATCH] Apparently jsexec hasn't been building for Win32 since
October: no, msvc10 doesn't have stdbool.h. Somehow the nightly build didn't
detect this failure.
---
src/sbbs3/jsdebug.c | 9 ++++-----
src/sbbs3/jsdebug.h | 3 +--
src/sbbs3/jsexec.vcxproj | 1 +
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/sbbs3/jsdebug.c b/src/sbbs3/jsdebug.c
index d752c6057c..cb8980a06a 100644
--- a/src/sbbs3/jsdebug.c
+++ b/src/sbbs3/jsdebug.c
@@ -9,7 +9,6 @@
#include <link_list.h>
#include <dirwrap.h>
#include <jsdbgapi.h>
-#include <stdbool.h>
#include <xpprintf.h>
struct breakpoint {
@@ -141,15 +140,15 @@ void setup_debugger(void)
listInit(&debuggers,LINK_LIST_MUTEX);
}
-bool init_debugger(JSRuntime *rt, JSContext *cx,void (*puts)(const char *), char *(*getline)(void))
+BOOL init_debugger(JSRuntime *rt, JSContext *cx,void (*puts)(const char *), char *(*getline)(void))
{
struct debugger *dbg;
if(get_debugger(cx))
- return false;
+ return FALSE;
dbg=malloc(sizeof(struct debugger));
if(!dbg)
- return false;
+ return FALSE;
dbg->cx=cx;
dbg->puts=puts;
dbg->getline=getline;
@@ -158,7 +157,7 @@ bool init_debugger(JSRuntime *rt, JSContext *cx,void (*puts)(const char *), char
JS_SetThrowHook(rt, throw_handler, NULL);
JS_SetNewScriptHook(rt, newscript_handler, NULL);
JS_SetDestroyScriptHook(rt, killscript_handler, NULL);
- return true;
+ return TRUE;
}
void end_debugger(JSRuntime *rt, JSContext *cx)
diff --git a/src/sbbs3/jsdebug.h b/src/sbbs3/jsdebug.h
index fbda658c5a..528ce9202a 100644
--- a/src/sbbs3/jsdebug.h
+++ b/src/sbbs3/jsdebug.h
@@ -2,7 +2,6 @@
#define JSDEBUG_H
#include <jsapi.h>
-#include <stdbool.h>
enum debug_action {
DEBUG_CONTINUE,
@@ -10,7 +9,7 @@ enum debug_action {
};
void setup_debugger(void);
-bool init_debugger(JSRuntime *rt, JSContext *cx,void (*puts)(const char *), char *(*getline)(void));
+BOOL init_debugger(JSRuntime *rt, JSContext *cx,void (*puts)(const char *), char *(*getline)(void));
enum debug_action debug_prompt(JSContext *cx, JSObject *script);
void end_debugger(JSRuntime *rt, JSContext *cx);
diff --git a/src/sbbs3/jsexec.vcxproj b/src/sbbs3/jsexec.vcxproj
index 83b2a6cd93..aba3f691a4 100644
--- a/src/sbbs3/jsexec.vcxproj
+++ b/src/sbbs3/jsexec.vcxproj
@@ -150,6 +150,7 @@
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="jsdebug.c" />
<ClCompile Include="js_conio.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
--
GitLab