Skip to content
Snippets Groups Projects
Commit 898f485a authored by rswindell's avatar rswindell
Browse files

Fix for gcc error: directives may not be used inside a macro argument.

parent 3e1b25e5
No related branches found
No related tags found
No related merge requests found
......@@ -152,6 +152,7 @@ void sbbs_read_ini(
const char* section;
const char* default_term_ansi;
const char* default_cgi_temp;
const char* default_dosemu_path;
char* ctrl_dir;
char host_name[128];
ulong js_max_bytes;
......@@ -195,6 +196,9 @@ void sbbs_read_ini(
bbs->js_max_bytes
=iniReadInteger(fp,section,"JavaScriptMaxBytes",js_max_bytes);
SAFECOPY(bbs->host_name
,iniReadString(fp,section,"HostName",host_name));
/* Set default terminal type to "stock" termcap closest to "ansi-bbs" */
#if defined(__FreeBSD__)
default_term_ansi="cons25";
......@@ -202,22 +206,19 @@ void sbbs_read_ini(
default_term_ansi="pc3";
#endif
SAFECOPY(bbs->host_name
,iniReadString(fp,section,"HostName",host_name));
SAFECOPY(bbs->xtrn_term_ansi
,iniReadString(fp,section,"ExternalTermANSI",default_term_ansi));
SAFECOPY(bbs->xtrn_term_dumb
,iniReadString(fp,section,"ExternalTermDumb","dumb"));
SAFECOPY(bbs->dosemu_path
,iniReadString(fp,section,"DOSemuPath"
#if defined(__FreeBSD__)
,"/usr/bin/doscmd"
default_dosemu_path="/usr/bin/doscmd";
#else
,"/usr/bin/dosemu"
default_dosemu_path="/usr/bin/dosemu";
#endif
);
SAFECOPY(bbs->dosemu_path
,iniReadString(fp,section,"DOSemuPath",default_dosemu_path));
SAFECOPY(bbs->answer_sound
,iniReadString(fp,section,"AnswerSound",nulstr));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment