diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-12 08:57:49 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-12 08:57:49 +0200 |
| commit | e57196f2f80432900523258af1038fb95a100b6b (patch) | |
| tree | c7c01095c5bf61ab5559886b0eb3aab36db579e5 | |
| parent | c7eae87870da755586446fecb4eb30063c1d641c (diff) | |
Resolve Windows port related issues
- Reorder dependencies for tar2sqfs
- Fix istream_t implementation issue
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | bin/tar2sqfs/Makemodule.am | 2 | ||||
| -rw-r--r-- | lib/io/src/win32/istream.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am index 920b226..44a3346 100644 --- a/bin/tar2sqfs/Makemodule.am +++ b/bin/tar2sqfs/Makemodule.am @@ -1,7 +1,7 @@ tar2sqfs_SOURCES = bin/tar2sqfs/src/tar2sqfs.c bin/tar2sqfs/src/tar2sqfs.h \ bin/tar2sqfs/src/options.c bin/tar2sqfs/src/process_tarball.c tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libio.a libxfrm.a +tar2sqfs_LDADD = libcommon.a libtar.a libsquashfs.la libio.a libxfrm.a tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a libutil.a $(LZO_LIBS) tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) tar2sqfs_LDADD += $(PTHREAD_LIBS) diff --git a/lib/io/src/win32/istream.c b/lib/io/src/win32/istream.c index 9bc32a0..0d002cc 100644 --- a/lib/io/src/win32/istream.c +++ b/lib/io/src/win32/istream.c @@ -153,7 +153,6 @@ istream_t *istream_open_file(const char *path) free(wpath); - strm->buffer = file->buffer; strm->get_buffered_data = file_get_buffered_data; strm->advance_buffer = file_advance_buffer; strm->get_filename = file_get_filename; @@ -178,7 +177,6 @@ istream_t *istream_open_stdin(void) sqfs_object_init(file, file_destroy, NULL); - strm->buffer = file->buffer; strm->get_buffered_data = file_get_buffered_data; strm->advance_buffer = file_advance_buffer; strm->get_filename = file_get_filename; |