From dcb1225ebf920fae0068faef1054aad97c284a7c Mon Sep 17 00:00:00 2001 From: Rob Swindell <rob@synchro.net> Date: Sat, 6 Mar 2021 20:51:22 -0800 Subject: [PATCH] Address GCC warnings recently introduced by not defining bbs_options in jsexec --- src/sbbs3/jsexec.c | 2 +- src/sbbs3/startup.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index a4160f1afe..31a4d57fab 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -29,7 +29,7 @@ #include <termios.h> #endif -#define STARTUP_INI_BITDESC_TABLES +#define STARTUP_INI_JSOPT_BITDESC_TABLE #include "sbbs.h" #include "ciolib.h" #include "ini_file.h" diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h index 7f0c0498fb..a8af8cf806 100644 --- a/src/sbbs3/startup.h +++ b/src/sbbs3/startup.h @@ -212,6 +212,13 @@ static ini_bitdesc_t bbs_options[] = { { 0 ,NULL } }; +#ifndef STARTUP_INI_JSOPT_BITDESC_TABLE +#define STARTUP_INI_JSOPT_BITDESC_TABLE +#endif + +#endif + +#ifdef STARTUP_INI_JSOPT_BITDESC_TABLE static ini_bitdesc_t js_options[] = { { 1<<0 ,"STRICT" }, @@ -224,10 +231,9 @@ static ini_bitdesc_t js_options[] = { { 1<<14 ,"METHODJIT" }, { 1<<15 ,"PROFILING" }, { 1<<16 ,"METHODJIT_ALWAYS" }, - /* terminator */ + /* terminator */ { 0 ,NULL } }; - #endif #ifdef __cplusplus -- GitLab