msvc: Fix unresolved mp_arg_error_terse_mismatch since 7f23384

stinos · stinos · commit fbfd3554fac2 · 2015-01-02T16:53:54.000+01:00
The compiler treats `if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE)` as
a normal statement and generates assembly for it in degug mode as if MICROPY_ERROR_REPORTING
is an actual symbol instead of a preprocessor definition.
As such linking fails because mp_arg_error_terse_mismatch is not defined when
MICROPY_ERROR_REPORTING_TERSE is detailed or normal.
diff --git a/py/argcheck.c b/py/argcheck.c
@@ -139,7 +139,7 @@ void mp_arg_parse_all_kw_array(mp_uint_t n_pos, mp_uint_t n_kw, const mp_obj_t *
     mp_arg_parse_all(n_pos, args, &kw_args, n_allowed, allowed, out_vals);
 }
 
-#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE || _MSC_VER
 NORETURN void mp_arg_error_terse_mismatch(void) {
     nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "argument num/types mismatch"));
 }

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void mp_arg_parse_all_kw_array(mp_uint_t n_pos, mp_uint_t n_kw, const mp_obj_t *`
`139`	`139`	`mp_arg_parse_all(n_pos, args, &kw_args, n_allowed, allowed, out_vals);`
`140`	`140`	`}`
`141`	`141`
`142`		`-#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE`
	`142`	`+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE \|\| _MSC_VER`
`143`	`143`	`NORETURN void mp_arg_error_terse_mismatch(void) {`
`144`	`144`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "argument num/types mismatch"));`
`145`	`145`	`}`