diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-09-24 14:59:10 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-09-24 15:34:22 -0700 |
| commit | 4bc58792b9e07e9c7f82f5ee8bf3190eab16e4e9 (patch) | |
| tree | d2b0f1f95e63df0f9b8d92fd4d9d9bd940d25756 | |
| parent | 5971f6a5113b12b33d9454229bf27621853e1da7 (diff) | |
| download | e2fsprogs-4bc58792b9e07e9c7f82f5ee8bf3190eab16e4e9.tar.gz | |
Fix unintended divergences from upstream e2fsprogs
Update lib/blkid/dev.c and lib/ext2fs/Makefile.in to match upstream.
These changes should have come in through the v1.44.3 merge, but they
apparently got dropped through a bad sequence of merges from a branch
that had a different version of the commit "e2fsdroid/libext2fs: move
hashmap into libext2fs" that lacked the changes to these files.
Test: see I3781b6d1e55923e9410644e8a7ba834b4d13b733
Change-Id: I5052f820f411ca2b4b1b61f8531f28822cf41b2b
| -rw-r--r-- | lib/blkid/dev.c | 1 | ||||
| -rw-r--r-- | lib/ext2fs/Makefile.in | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c index d35513e4..1d62dd88 100644 --- a/lib/blkid/dev.c +++ b/lib/blkid/dev.c @@ -13,6 +13,7 @@ #include "config.h" #include <stdlib.h> #include <string.h> +#include <stdint.h> #include "blkidP.h" diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index fb9dda33..c2163bf5 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -93,6 +93,7 @@ OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) \ get_pathname.o \ getsize.o \ getsectsize.o \ + hashmap.o \ i_block.o \ icount.o \ ind_block.o \ @@ -173,6 +174,7 @@ SRCS= ext2_err.c \ $(srcdir)/get_pathname.c \ $(srcdir)/getsize.c \ $(srcdir)/getsectsize.c \ + $(srcdir)/hashmap.c \ $(srcdir)/i_block.c \ $(srcdir)/icount.c \ $(srcdir)/ind_block.c \ |