From a5fa39611bd32f19a2c685b497e930cc55ac61a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Fri, 2 Apr 2021 03:31:33 -0400
Subject: [PATCH] "Please don't add any more DLLCALLs"
---
src/sbbs3/js_console.cpp | 4 ++--
src/sbbs3/js_internal.c | 4 ++--
src/sbbs3/sbbs.h | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp
index 5abd4df418..02c0385502 100644
--- a/src/sbbs3/js_console.cpp
+++ b/src/sbbs3/js_console.cpp
@@ -1998,7 +1998,7 @@ js_getlines(JSContext *cx, uintN argc, jsval *arglist)
return(JS_TRUE);
}
-void DLLCALL
+void
js_do_lock_input(JSContext *cx, JSBool lock)
{
sbbs_t* sbbs;
@@ -2124,7 +2124,7 @@ js_term_updated(JSContext *cx, uintN argc, jsval *arglist)
return JS_TRUE;
}
-size_t DLLCALL
+size_t
js_cx_input_pending(JSContext *cx)
{
sbbs_t* sbbs;
diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c
index 74a25bb168..9027fa46b8 100644
--- a/src/sbbs3/js_internal.c
+++ b/src/sbbs3/js_internal.c
@@ -760,7 +760,7 @@ js_setTimeout(JSContext *cx, uintN argc, jsval *arglist)
return JS_TRUE;
}
-JSBool DLLCALL
+JSBool
js_clear_event(JSContext *cx, uintN argc, jsval *arglist, enum js_event_type et)
{
jsval *argv=JS_ARGV(cx, arglist);
@@ -1052,7 +1052,7 @@ js_clear_events(JSContext *cx, js_callback_t *cb)
cb->listeners = NULL;
}
-JSBool DLLCALL
+JSBool
js_handle_events(JSContext *cx, js_callback_t *cb, volatile int *terminated)
{
struct js_event_list **head = &cb->events;
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index f0daa4ceb2..5063311df4 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -1381,8 +1381,8 @@ extern "C" {
DLLEXPORT void DLLCALL js_EvalOnExit(JSContext*, JSObject*, js_callback_t*);
DLLEXPORT void DLLCALL js_PrepareToExecute(JSContext*, JSObject*, const char *filename, const char* startup_dir, JSObject *);
DLLEXPORT char* DLLCALL js_getstring(JSContext *cx, JSString *str);
- DLLEXPORT JSBool DLLCALL js_handle_events(JSContext *cx, js_callback_t *cb, volatile int *terminated);
- DLLEXPORT JSBool DLLCALL js_clear_event(JSContext *cx, uintN argc, jsval *arglist, enum js_event_type et);
+ DLLEXPORT JSBool js_handle_events(JSContext *cx, js_callback_t *cb, volatile int *terminated);
+ DLLEXPORT JSBool js_clear_event(JSContext *cx, uintN argc, jsval *arglist, enum js_event_type et);
/* js_system.c */
DLLEXPORT JSObject* DLLCALL js_CreateSystemObject(JSContext* cx, JSObject* parent
@@ -1457,8 +1457,8 @@ extern "C" {
/* js_console.cpp */
JSObject* js_CreateConsoleObject(JSContext* cx, JSObject* parent);
- DLLEXPORT size_t DLLCALL js_cx_input_pending(JSContext *cx);
- DLLEXPORT void DLLCALL js_do_lock_input(JSContext *cx, JSBool lock);
+ DLLEXPORT size_t js_cx_input_pending(JSContext *cx);
+ DLLEXPORT void js_do_lock_input(JSContext *cx, JSBool lock);
/* js_bbs.cpp */
JSObject* js_CreateBbsObject(JSContext* cx, JSObject* parent);
--
GitLab