Merge pull request #263 from rojer/wundef

Fix build with -Wundef
This commit is contained in:
Christopher Haster
2019-08-08 18:50:40 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -29,7 +29,7 @@ override CFLAGS += -DLFS_YES_TRACE
endif endif
override CFLAGS += -I. override CFLAGS += -I.
override CFLAGS += -std=c99 -Wall -pedantic override CFLAGS += -std=c99 -Wall -pedantic
override CFLAGS += -Wextra -Wshadow -Wjump-misses-init override CFLAGS += -Wextra -Wshadow -Wjump-misses-init -Wundef
# Remove missing-field-initializers because of GCC bug # Remove missing-field-initializers because of GCC bug
override CFLAGS += -Wno-missing-field-initializers override CFLAGS += -Wno-missing-field-initializers

2
lfs.c
View File

@@ -1502,7 +1502,7 @@ static int lfs_dir_compact(lfs_t *lfs,
end = begin; end = begin;
} }
} }
#if LFS_MIGRATE #ifdef LFS_MIGRATE
} else if (lfs_pair_cmp(dir->pair, lfs->root) == 0 && lfs->lfs1) { } else if (lfs_pair_cmp(dir->pair, lfs->root) == 0 && lfs->lfs1) {
// we can't relocate our root during migrations, as this would // we can't relocate our root during migrations, as this would
// cause the superblock to get updated, which would clobber v1 // cause the superblock to get updated, which would clobber v1