summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-25 10:11:19 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-25 10:12:40 +0200
commitf64986ac1d95ffb2604cfef0efa8e7d2e0b7f8ce (patch)
treee95c705047581b5bd7e318bf88c258f1c316b3be /lib
parent50a551eda7105c90f529efc2f2907dc0cd1c58cf (diff)
Move sqfs_block_t to its own header
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/sqfs/Makemodule.am2
-rw-r--r--lib/sqfs/data_reader.c2
-rw-r--r--lib/sqfs/data_writer/internal.h1
-rw-r--r--lib/sqfs/io.c2
-rw-r--r--lib/sqfshelper/data_reader_dump.c2
-rw-r--r--lib/sqfshelper/data_writer.c2
6 files changed, 7 insertions, 4 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 459f359..b07cc5b 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -6,7 +6,7 @@ LIBSQFS_HEARDS = include/sqfs/data.h include/sqfs/meta_writer.h \
include/sqfs/table.h include/sqfs/predef.h \
include/sqfs/error.h include/sqfs/dir_reader.h \
include/sqfs/dir_writer.h include/sqfs/io.h \
- include/sqfs/data_reader.h
+ include/sqfs/data_reader.h include/sqfs/block.h
libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/id_table.c lib/sqfs/super.c
libsquashfs_la_SOURCES += lib/sqfs/readdir.c lib/sqfs/io_file.c lib/sqfs/xattr.c
diff --git a/lib/sqfs/data_reader.c b/lib/sqfs/data_reader.c
index 0ea08ee..d8645d1 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfs/data_reader.c
@@ -7,9 +7,9 @@
#define SQFS_BUILDING_DLL
#include "config.h"
-#include "sqfs/data_writer.h"
#include "sqfs/data_reader.h"
#include "sqfs/compress.h"
+#include "sqfs/block.h"
#include "sqfs/error.h"
#include "sqfs/table.h"
#include "sqfs/inode.h"
diff --git a/lib/sqfs/data_writer/internal.h b/lib/sqfs/data_writer/internal.h
index 10cc82c..69de9ac 100644
--- a/lib/sqfs/data_writer/internal.h
+++ b/lib/sqfs/data_writer/internal.h
@@ -14,6 +14,7 @@
#include "sqfs/inode.h"
#include "sqfs/table.h"
#include "sqfs/error.h"
+#include "sqfs/block.h"
#include "sqfs/data.h"
#include "sqfs/io.h"
#include "util.h"
diff --git a/lib/sqfs/io.c b/lib/sqfs/io.c
index 40bf5d8..f4ffda2 100644
--- a/lib/sqfs/io.c
+++ b/lib/sqfs/io.c
@@ -9,7 +9,7 @@
#include "sqfs/io.h"
#include "sqfs/error.h"
-#include "sqfs/data_writer.h"
+#include "sqfs/block.h"
#include "util.h"
#include <stdlib.h>
diff --git a/lib/sqfshelper/data_reader_dump.c b/lib/sqfshelper/data_reader_dump.c
index fa876c3..5675469 100644
--- a/lib/sqfshelper/data_reader_dump.c
+++ b/lib/sqfshelper/data_reader_dump.c
@@ -6,8 +6,8 @@
*/
#include "config.h"
-#include "sqfs/data_writer.h"
#include "sqfs/data_reader.h"
+#include "sqfs/block.h"
#include "highlevel.h"
#include "util.h"
diff --git a/lib/sqfshelper/data_writer.c b/lib/sqfshelper/data_writer.c
index e2a8538..4134035 100644
--- a/lib/sqfshelper/data_writer.c
+++ b/lib/sqfshelper/data_writer.c
@@ -7,6 +7,8 @@
#include "config.h"
#include "sqfs/data_writer.h"
+#include "sqfs/block.h"
+
#include "data_writer.h"
#include "highlevel.h"
#include "util.h"