From 3c5e7b89abccea0be0d08ffbb9068df65ee4e33e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 10 Sep 2021 18:58:32 +0200 Subject: [PATCH] spi_flash: extern spi_flash_chip_generic_timeout spi_flash_generic_timeout is currently defined in the header file, which makes it a common symbol between translation units where this header file is included. It is also defined in spi_flash_chip_generic.c. Add an explicit `extern` to prevent multiple definition errors. --- components/spi_flash/include/spi_flash_chip_generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/spi_flash/include/spi_flash_chip_generic.h b/components/spi_flash/include/spi_flash_chip_generic.h index 000d2c943c..019a6966a4 100644 --- a/components/spi_flash/include/spi_flash_chip_generic.h +++ b/components/spi_flash/include/spi_flash_chip_generic.h @@ -408,4 +408,4 @@ esp_err_t spi_flash_chip_generic_suspend_cmd_conf(esp_flash_t *chip); esp_err_t spi_flash_chip_generic_read_unique_id_none(esp_flash_t *chip, uint64_t* flash_unique_id); /// Default timeout configuration used by most chips -const flash_chip_op_timeout_t spi_flash_chip_generic_timeout; +extern const flash_chip_op_timeout_t spi_flash_chip_generic_timeout;