8000 Add externs. GCC10 complains about duplicate defines · ansonhex/circuitpython@2bd6d05 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2bd6d05

Browse files
tannewttannewt
committed
Add externs. GCC10 complains about duplicate defines
1 parent d22283c commit 2bd6d05

File tree

15 files changed

+22
-20
lines changed

15 files changed

+22
-20
lines changed

‎main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,8 @@ bool run_code_py(safe_mode_t safe_mode) {
331331
}
332332
}
333333

334+
FIL* boot_output_file;
335+
334336
void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
335337
// If not in safe mode, run boot before initing USB and capture output in a
336338
// file.

‎ports/atmel-samd/mphalport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#define mp_hal_ticks_ms() ((mp_uint_t) supervisor_ticks_ms32())
3838

3939
// Number of bytes in receive buffer
40-
volatile uint8_t usb_rx_count;
41-
volatile bool mp_cdc_enabled;
40+
extern volatile uint8_t usb_rx_count;
41+
extern volatile bool mp_cdc_enabled;
4242

4343
int receive_usb(void);
4444

‎py/objstr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
7777
mp_obj_t index, bool is_slice);
7878
const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction);
7979

80-
const char nibble_to_hex_upper[16];
81-
const char nibble_to_hex_lower[16];
80+
extern const char nibble_to_hex_upper[16];
81+
extern const char nibble_to_hex_lower[16];
8282

8383
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj);
8484
MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj);

‎shared-bindings/_pixelbuf/PixelBuf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "shared-module/_pixelbuf/PixelBuf.h"
3131

32-
const mp_obj_type_t pixelbuf_pixelbuf_type;
32+
extern const mp_obj_type_t pixelbuf_pixelbuf_type;
3333

3434
void common_hal__pixelbuf_pixelbuf_construct(pixelbuf_pixelbuf_obj_t *self, size_t n,
3535
pixelbuf_byteorder_details_t* byteorder, mp_float_t brightness, bool auto_write, uint8_t* header,

‎shared-bindings/digitalio/Direction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef struct {
3737
mp_obj_base_t base;
3838
} digitalio_direction_obj_t;
3939

40-
const mp_obj_type_t digitalio_direction_type;
40+
extern const mp_obj_type_t digitalio_direction_type;
4141

4242
extern const digitalio_direction_obj_t digitalio_direction_input_obj;
4343
extern const digitalio_direction_obj_t digitalio_direction_output_obj;

‎shared-bindings/digitalio/DriveMode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef struct {
3838
mp_obj_base_t base;
3939
} digitalio_drive_mode_obj_t;
4040

41-
const mp_obj_type_t digitalio_drive_mode_type;
41+
extern const mp_obj_type_t digitalio_drive_mode_type;
4242

4343
extern const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj;
4444
extern const digitalio_drive_mode_obj_t digitalio_drive_mode_open_drain_obj;

‎shared-bindings/digitalio/Pull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef enum _digitalio_pull_t {
3535
PULL_DOWN
3636
} digitalio_pull_t;
3737

38-
const mp_obj_type_t digitalio_pull_type;
38+
extern const mp_obj_type_t digitalio_pull_type;
3939

4040
typedef struct {
4141
mp_obj_base_t base;

‎shared-bindings/microcontroller/Processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include "common-hal/microcontroller/Processor.h"
3333

34-
const mp_obj_type_t mcu_processor_type;
34+
extern const mp_obj_type_t mcu_processor_type;
3535

3636
uint32_t common_hal_mcu_processor_get_frequency(void);
3737
float common_hal_mcu_processor_get_temperature(void);

‎shared-bindings/microcontroller/RunMode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef enum {
3535
RUNMODE_BOOTLOADER
3636
} mcu_runmode_t;
3737

38-
const mp_obj_type_t mcu_runmode_type;
38+
extern const mp_obj_type_t mcu_runmode_type;
3939

4040
typedef struct {
4141
mp_obj_base_t base;

‎shared-bindings/nvm/ByteArray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "common-hal/nvm/ByteArray.h"
3131

32-
const mp_obj_type_t nvm_bytearray_type;
32+
extern const mp_obj_type_t nvm_bytearray_type;
3333

3434
uint32_t common_hal_nvm_bytearray_get_length(nvm_bytearray_obj_t *self);
3535

0 commit comments

Comments
 (0)
0