7 files changed, 10 insertions, 9 deletions
diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c
index 4adc24f..89624f4 100644
--- a/bin/gensquashfs/src/filemap_xattr.c
+++ b/bin/gensquashfs/src/filemap_xattr.c
@@ -159,7 +159,7 @@ xattr_open_map_file(const char *path) {
 	struct XattrMap *map;
 	size_t line_num = 1;
 	char *p = NULL;
-	istream_t *file = istream_open_file(path);
+	sqfs_istream_t *file = istream_open_file(path);
 	if (file == NULL) {
 		return NULL;
 	}
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index 325bce2..efb5d43 100644
--- a/bin/gensquashfs/src/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
@@ -273,7 +273,8 @@ out_desc:
 	return -1;
 }
 
-int fstree_from_file_stream(fstree_t *fs, istream_t *fp, const char *basepath)
+int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *fp,
+			    const char *basepath)
 {
 	const char *filename;
 	size_t line_num = 1;
@@ -309,7 +310,7 @@ fail_line:
 
 int fstree_from_file(fstree_t *fs, const char *filename, const char *basepath)
 {
-	istream_t *fp;
+	sqfs_istream_t *fp;
 	int ret;
 
 	fp = istream_open_file(filename);
diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c
index b64a217..cdef359 100644
--- a/bin/gensquashfs/src/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
@@ -137,7 +137,7 @@ static void override_owner_dfs(const options_t *opt, tree_node_t *n)
 int main(int argc, char **argv)
 {
 	int status = EXIT_FAILURE;
-	istream_t *sortfile = NULL;
+	sqfs_istream_t *sortfile = NULL;
 	void *sehnd = NULL;
 	void *xattrmap = NULL;
 	sqfs_writer_t sqfs;
diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h
index 0a9a3b3..5c97750 100644
--- a/bin/gensquashfs/src/mkfs.h
+++ b/bin/gensquashfs/src/mkfs.h
@@ -104,7 +104,7 @@ void selinux_close_context_file(void *sehnd);
 int fstree_from_file(fstree_t *fs, const char *filename,
 		     const char *basepath);
 
-int fstree_from_file_stream(fstree_t *fs, istream_t *file,
+int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *file,
 			    const char *basepath);
 
 /*
@@ -114,7 +114,7 @@ int fstree_from_file_stream(fstree_t *fs, istream_t *file,
  */
 int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir);
 
-int fstree_sort_files(fstree_t *fs, istream_t *sortfile);
+int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile);
 
 int glob_files(fstree_t *fs, const char *filename, size_t line_num,
 	       const dir_entry_t *ent,
diff --git a/bin/gensquashfs/src/sort_by_file.c b/bin/gensquashfs/src/sort_by_file.c
index e2b6338..6e96d5b 100644
--- a/bin/gensquashfs/src/sort_by_file.c
+++ b/bin/gensquashfs/src/sort_by_file.c
@@ -232,7 +232,7 @@ static void sort_file_list(fstree_t *fs)
 	fs->files = out;
 }
 
-int fstree_sort_files(fstree_t *fs, istream_t *sortfile)
+int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile)
 {
 	const char *filename;
 	size_t line_num = 1;
diff --git a/bin/gensquashfs/test/fstree_from_file.c b/bin/gensquashfs/test/fstree_from_file.c
index e54111c..a5500dc 100644
--- a/bin/gensquashfs/test/fstree_from_file.c
+++ b/bin/gensquashfs/test/fstree_from_file.c
@@ -25,7 +25,7 @@ const char *listing =
 int main(int argc, char **argv)
 {
 	fstree_defaults_t fsd;
-	istream_t *file;
+	sqfs_istream_t *file;
 	tree_node_t *n;
 	fstree_t fs;
 	(void)argc; (void)argv;
diff --git a/bin/gensquashfs/test/sort_file.c b/bin/gensquashfs/test/sort_file.c
index af50260..063f95d 100644
--- a/bin/gensquashfs/test/sort_file.c
+++ b/bin/gensquashfs/test/sort_file.c
@@ -111,8 +111,8 @@ static int flags[] = {
 
 int main(int argc, char **argv)
 {
+	sqfs_istream_t *memstream;
 	fstree_defaults_t fsd;
-	istream_t *memstream;
 	tree_node_t *n;
 	fstree_t fs;
 	size_t i;