From 52a2f53a9aef1c3b69150dc585874a74dab79794 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Thu, 5 Sep 2019 19:15:00 +0200
Subject: Cleanup: move inclusion of type headers to predef.h

Instead of including stddef/stdint/stdbool etc... all over the place,
move it to predef.h which is included from all other headers.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 include/sqfs/compress.h | 5 -----
 include/sqfs/data.h     | 4 +---
 include/sqfs/dir.h      | 2 --
 include/sqfs/id_table.h | 3 ---
 include/sqfs/inode.h    | 2 --
 include/sqfs/predef.h   | 5 +++++
 include/sqfs/super.h    | 3 ---
 include/sqfs/table.h    | 3 ---
 include/sqfs/xattr.h    | 4 ----
 9 files changed, 6 insertions(+), 25 deletions(-)

(limited to 'include')

diff --git a/include/sqfs/compress.h b/include/sqfs/compress.h
index 27c603d..e897cf2 100644
--- a/include/sqfs/compress.h
+++ b/include/sqfs/compress.h
@@ -9,11 +9,6 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include "sqfs/predef.h"
 #include "sqfs/super.h"
 
diff --git a/include/sqfs/data.h b/include/sqfs/data.h
index 1b70f45..415f797 100644
--- a/include/sqfs/data.h
+++ b/include/sqfs/data.h
@@ -9,9 +9,7 @@
 
 #include "config.h"
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
+#include "sqfs/predef.h"
 
 #define SQFS_META_BLOCK_SIZE 8192
 
diff --git a/include/sqfs/dir.h b/include/sqfs/dir.h
index 3a65102..46197e8 100644
--- a/include/sqfs/dir.h
+++ b/include/sqfs/dir.h
@@ -13,8 +13,6 @@
 #include "sqfs/meta_reader.h"
 #include "sqfs/meta_writer.h"
 
-#include <stdint.h>
-
 #define SQFS_MAX_DIR_ENT 256
 
 typedef struct {
diff --git a/include/sqfs/id_table.h b/include/sqfs/id_table.h
index f8b3b5c..35af699 100644
--- a/include/sqfs/id_table.h
+++ b/include/sqfs/id_table.h
@@ -9,9 +9,6 @@
 
 #include "config.h"
 
-#include <stdint.h>
-#include <stddef.h>
-
 #include "sqfs/predef.h"
 #include "sqfs/compress.h"
 
diff --git a/include/sqfs/inode.h b/include/sqfs/inode.h
index 37a088c..5a08b14 100644
--- a/include/sqfs/inode.h
+++ b/include/sqfs/inode.h
@@ -13,8 +13,6 @@
 #include "sqfs/meta_reader.h"
 #include "sqfs/meta_writer.h"
 
-#include <stdint.h>
-
 typedef enum {
 	SQFS_INODE_DIR = 1,
 	SQFS_INODE_FILE = 2,
diff --git a/include/sqfs/predef.h b/include/sqfs/predef.h
index 210f306..0fec9e2 100644
--- a/include/sqfs/predef.h
+++ b/include/sqfs/predef.h
@@ -7,6 +7,11 @@
 #ifndef SQFS_PREDEF_H
 #define SQFS_PREDEF_H
 
+#include <sys/types.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 	#ifdef SQFS_BUILDING_DLL
 		#if defined(__GNUC__) || defined(__clang__)
diff --git a/include/sqfs/super.h b/include/sqfs/super.h
index 6593555..cf5dc41 100644
--- a/include/sqfs/super.h
+++ b/include/sqfs/super.h
@@ -11,9 +11,6 @@
 
 #include "sqfs/predef.h"
 
-#include <stdint.h>
-#include <stddef.h>
-
 #define SQFS_MAGIC 0x73717368
 #define SQFS_VERSION_MAJOR 4
 #define SQFS_VERSION_MINOR 0
diff --git a/include/sqfs/table.h b/include/sqfs/table.h
index 0bd3112..9ce37fb 100644
--- a/include/sqfs/table.h
+++ b/include/sqfs/table.h
@@ -11,9 +11,6 @@
 #include "sqfs/compress.h"
 #include "sqfs/super.h"
 
-#include <stdint.h>
-#include <stddef.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/sqfs/xattr.h b/include/sqfs/xattr.h
index d1b3bdd..b9bb166 100644
--- a/include/sqfs/xattr.h
+++ b/include/sqfs/xattr.h
@@ -12,10 +12,6 @@
 #include "sqfs/predef.h"
 #include "sqfs/compress.h"
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-
 typedef enum {
 	SQFS_XATTR_USER = 0,
 	SQFS_XATTR_TRUSTED = 1,
-- 
cgit v1.2.3