Merge remote-tracking branch 'DanielMartensson/master'

This commit is contained in:
Valerio De Benedetto 2024-12-08 11:54:58 +01:00
commit cfc1dd00c8

View File

@ -1335,7 +1335,7 @@ static nmbs_error handle_read_file_record(nmbs_t* nmbs) {
uint16_t record_number; uint16_t record_number;
uint16_t record_length; uint16_t record_length;
} }
#ifdef __STDC_NO_VLA__ #if defined(__STDC_NO_VLA__) || defined(_MSC_VER)
subreq[35]; // 245 / subreq_header_size subreq[35]; // 245 / subreq_header_size
#else #else
subreq[subreq_count]; subreq[subreq_count];
@ -1553,7 +1553,7 @@ static nmbs_error handle_read_write_registers(nmbs_t* nmbs) {
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
return err; return err;
#ifdef __STDC_NO_VLA__ #if defined(__STDC_NO_VLA__) || defined(_MSC_VER)
uint16_t registers[0x007B]; uint16_t registers[0x007B];
#else #else
uint16_t registers[byte_count_write / 2]; uint16_t registers[byte_count_write / 2];
@ -1596,7 +1596,7 @@ static nmbs_error handle_read_write_registers(nmbs_t* nmbs) {
} }
if (!nmbs->msg.broadcast) { if (!nmbs->msg.broadcast) {
#ifdef __STDC_NO_VLA__ #if defined(__STDC_NO_VLA__) || defined(_MSC_VER)
uint16_t regs[125]; uint16_t regs[125];
#else #else
uint16_t regs[read_quantity]; uint16_t regs[read_quantity];