diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-16 01:41:06 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-16 03:51:11 +0200 |
| commit | c81e80bf35874696d9735f70e5c8327f92b5aca4 (patch) | |
| tree | 5ef99ab43bde73674391d02ccc65d357874a34c1 /lib/sqfs/Makemodule.am | |
| parent | 8bff2715bfdfd2e6ce0c707f1310b169d4e454d0 (diff) | |
libsquashfs: merge windows & unix file I/O primitives
By adding additional close/duplicate primitives, the remaining, mostly
identical istream/ostream/file code is mostly identical between Windows
and Unix and be merged, mostly without stitches.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfs/Makemodule.am')
| -rw-r--r-- | lib/sqfs/Makemodule.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index 83ca478..c722f16 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -30,7 +30,8 @@ libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/src/id_table.c \ lib/sqfs/src/block_processor/block_processor.c \ lib/sqfs/src/block_processor/backend.c \ lib/sqfs/src/frag_table.c lib/sqfs/src/block_writer.c \ - lib/sqfs/src/misc.c lib/sqfs/src/istream.c + lib/sqfs/src/misc.c lib/sqfs/src/istream.c lib/sqfs/src/io/istream.c \ + lib/sqfs/src/io/ostream.c lib/sqfs/src/io/file.c libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS) libsquashfs_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSQUASHFS_SO_VERSION) libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) @@ -57,15 +58,13 @@ libsquashfs_la_SOURCES += lib/util/src/mempool.c include/util/mempool.h endif if WINDOWS -libsquashfs_la_SOURCES += lib/sqfs/src/win32/io_file.c \ - lib/sqfs/src/win32/ostream.c lib/sqfs/src/win32/istream.c +libsquashfs_la_SOURCES += lib/sqfs/src/io/win32.c libsquashfs_la_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 libsquashfs_la_CFLAGS += -Wc,-static-libgcc libsquashfs_la_LDFLAGS += -no-undefined -avoid-version else -libsquashfs_la_SOURCES += lib/sqfs/src/unix/io_file.c \ - lib/sqfs/src/unix/ostream.c lib/sqfs/src/unix/istream.c +libsquashfs_la_SOURCES += lib/sqfs/src/io/unix.c endif if HAVE_PTHREAD |