Skip to content
Snippets Groups Projects
Commit da313d28 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix MSVC compiler issues introduced in previous commit

And use DWORD insteaad of 'unsigned long' where specified by Win32 API.
parent 5277021c
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
Pipeline #6375 passed
...@@ -226,7 +226,7 @@ static BYTE* cp437_to_utf8(BYTE* input, size_t& len, BYTE* outbuf, size_t maxlen ...@@ -226,7 +226,7 @@ static BYTE* cp437_to_utf8(BYTE* input, size_t& len, BYTE* outbuf, size_t maxlen
switch (ch) { switch (ch) {
case '\a': case '\a':
case '\b': case '\b':
case '\e': case ESC: // '\e' not supported by MSVC
case '\f': case '\f':
case '\n': case '\n':
case '\r': case '\r':
...@@ -366,12 +366,12 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -366,12 +366,12 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
HANDLE rdoutpipe; HANDLE rdoutpipe;
HANDLE wrinpipe; HANDLE wrinpipe;
PROCESS_INFORMATION process_info; PROCESS_INFORMATION process_info;
unsigned long rd; size_t rd;
unsigned long wr; DWORD wr;
unsigned long len; DWORD len;
DWORD avail; DWORD avail;
unsigned long msglen; DWORD msglen;
unsigned long retval; DWORD retval;
DWORD last_error; DWORD last_error;
DWORD loop_since_io=0; DWORD loop_since_io=0;
struct tm tm; struct tm tm;
...@@ -722,9 +722,11 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir) ...@@ -722,9 +722,11 @@ int sbbs_t::external(const char* cmdline, int mode, const char* startup_dir)
} }
/* CR expansion */ /* CR expansion */
if(use_pipes) if(use_pipes) {
bp=cr_expand(buf,wr,output_buf,wr); size_t sz;
else bp=cr_expand(buf,wr,output_buf,sz);
wr = sz;
} else
bp=buf; bp=buf;
len=0; len=0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment