Skip to content

Commit 088cf44

Browse files
committed
Merge pull request #3 from martinayotte/master
fix SPIFFS_USE_MAGIC, fix Windows compile with -mno-ms-bitfields
2 parents ad96e33 + f466b46 commit 088cf44

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ifeq ($(OS),Windows_NT)
77
ARCHIVE_CMD := 7z a
88
ARCHIVE_EXTENSION := zip
99
TARGET := mkspiffs.exe
10+
TARGET_CFLAGS := -mno-ms-bitfields
1011
TARGET_LDFLAGS := -Wl,-static -static-libgcc
1112

1213
else

spiffs/spiffs_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ typedef uint8_t u8_t;
136136
// not on mount point. If not, SPIFFS_format must be called prior to mounting
137137
// again.
138138
#ifndef SPIFFS_USE_MAGIC
139-
#define SPIFFS_USE_MAGIC (0)
139+
#define SPIFFS_USE_MAGIC (1)
140140
#endif
141141

142142
// SPIFFS_LOCK and SPIFFS_UNLOCK protects spiffs from reentrancy on api level

0 commit comments

Comments
 (0)