diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h index d4774adf3e9b9c9839001c7468309c93fb6d0e99..d3aacc082fa53e18317318f71c1893433a36313d 100644 --- a/cc3200/mpconfigport.h +++ b/cc3200/mpconfigport.h @@ -114,9 +114,6 @@ #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0) // extra built in names to add to the global namespace -extern const struct _mp_obj_fun_builtin_t mp_builtin_help_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_input_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h index 4aba68267623fe2ee7fcee897ed612cb9b4e8d35..577b37398157a0f3818c089601d62727cabcd12d 100644 --- a/esp8266/mpconfigport.h +++ b/esp8266/mpconfigport.h @@ -104,7 +104,6 @@ typedef uint32_t sys_prot_t; // for modlwip #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len) // extra built in names to add to the global namespace -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, diff --git a/py/builtin.h b/py/builtin.h index 35d8910bd8d36eb5e784e7dc62f4641ffb3d8939..f63eac73ef8a641b2500afc9c2f13fd1fdd5d9e1 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -71,6 +71,10 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_repr_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_round_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sorted_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sum_obj); +// Defined by a port, but declared here for simplicity +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_help_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_input_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_open_obj); MP_DECLARE_CONST_FUN_OBJ(mp_namedtuple_obj); diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h index 455239db3cb040898d89b25c60cd45b04686bd0c..6ec92acbfe2662bd3150941161d77e643cea4642 100644 --- a/stmhal/mpconfigport.h +++ b/stmhal/mpconfigport.h @@ -97,9 +97,6 @@ #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0) // extra built in names to add to the global namespace -extern const struct _mp_obj_fun_builtin_t mp_builtin_help_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_input_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h index 4b2181cdb6c02638e8d1ce041fe6fe5c4f23fce9..867c4e652791db89123258eda9dd31911eca611a 100644 --- a/teensy/mpconfigport.h +++ b/teensy/mpconfigport.h @@ -27,9 +27,6 @@ #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0) // extra built in names to add to the global namespace -extern const struct _mp_obj_fun_builtin_t mp_builtin_help_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_input_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 28a7e8b76302ac35ce3ac340f1c9d1b48ef92e72..abda4325801be7d40108a8dc222ecf1c3c36baa8 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -259,8 +259,6 @@ void mp_unix_mark_exec(void); #endif #endif -extern const struct _mp_obj_fun_builtin_t mp_builtin_input_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_ROM_QSTR(MP_QSTR_input), MP_ROM_PTR(&mp_builtin_input_obj) }, \ { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) }, diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h index 203aa04494805ecb830beec2d6cd78e912a84b75..51d4697e4d785bfa2eea0886d9614fdd34e1a79d 100644 --- a/windows/mpconfigport.h +++ b/windows/mpconfigport.h @@ -149,8 +149,6 @@ void mp_hal_dupterm_tx_strn(const char *str, size_t len); #define mp_hal_dupterm_tx_strn(s, l) #endif -extern const struct _mp_obj_fun_builtin_t mp_builtin_input_obj; -extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj; #define MICROPY_PORT_BUILTINS \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },