Skip to content

Commit d7b895c

Browse files
[nrf toup] Fix defines for ZMS
It can be squashed with the 0c49058 commit. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent 9a4ea8e commit d7b895c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/platform/Zephyr/ConfigurationManagerImpl.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939

4040
#ifdef CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
4141
#include <zephyr/settings/settings.h>
42-
#ifdef CONFIG_SETTINGS_NVS
42+
#if defined(CONFIG_SETTINGS_NVS)
4343
#include <zephyr/fs/nvs.h>
44-
#elif CONFIG_SETTINGS_ZMS
44+
#elif defined(CONFIG_SETTINGS_ZMS)
4545
#include <zephyr/fs/zms.h>
4646
#endif // CONFIG_SETTINGS_NVS || CONFIG_SETTINGS_ZMS
4747
#endif // CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
@@ -204,9 +204,9 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
204204

205205
if (status == 0)
206206
{
207-
#ifdef CONFIG_SETTINGS_NVS
207+
#if defined(CONFIG_SETTINGS_NVS)
208208
status = nvs_clear(static_cast<nvs_fs *>(storage));
209-
#elif CONFIG_SETTINGS_ZMS
209+
#elif defined(CONFIG_SETTINGS_ZMS)
210210
status = zms_clear(static_cast<zms_fs *>(storage));
211211
#endif // CONFIG_SETTINGS_NVS || CONFIG_SETTINGS_ZMS
212212
}

0 commit comments

Comments
 (0)