From b6ba81034b1b74cf426abcece4becda2611504a4 Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Thu, 2 Sep 2021 19:15:24 +0300

Subject: [Backport b6ba81034b1b] src: Add missing header and guards to

 lib/ headers

size_t needs header. Add missing header guards so that compiler will

only include these ones.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/lib/decompress_common.h | 5 +++++

 src/lib/lib.h               | 6 ++++++

 2 files changed, 11 insertions(+)

diff --git a/src/lib/decompress_common.h b/src/lib/decompress_common.h

index 2d70ae42f1b511f3b43af7a9b886ac1ffd21822b..dd7ced000d0e755ca1b337273dab7577c194a7c4 100644

--- a/src/lib/decompress_common.h

+++ b/src/lib/decompress_common.h

@@ -5,6 +5,9 @@

  * Copyright (C) 2015 Eric Biggers

  */

+#ifndef _LINUX_NTFS3_LIB_DECOMPRESS_COMMON_H

+#define _LINUX_NTFS3_LIB_DECOMPRESS_COMMON_H

+

 #include <linux/string.h>

 #include <linux/compiler.h>

 #include <linux/types.h>

@@ -336,3 +339,5 @@ static forceinline u8 *lz_copy(u8 *dst, u32 length, u32 offset, const u8 *bufend

 	return dst;

 }

+

+#endif /* _LINUX_NTFS3_LIB_DECOMPRESS_COMMON_H */

diff --git a/src/lib/lib.h b/src/lib/lib.h

index f508fbad2e712d946274b13f0ec7b244dc264a4d..90309a5ae59c7a98f3f0b61f5883fe390790eb50 100644

--- a/src/lib/lib.h

+++ b/src/lib/lib.h

@@ -7,6 +7,10 @@

  * - linux kernel code style

  */

+#ifndef _LINUX_NTFS3_LIB_LIB_H

+#define _LINUX_NTFS3_LIB_LIB_H

+

+#include <linux/types.h>

 /* globals from xpress_decompress.c */

 struct xpress_decompressor *xpress_allocate_decompressor(void);

@@ -24,3 +28,5 @@ int lzx_decompress(struct lzx_decompressor *__restrict d,

 		   const void *__restrict compressed_data,

 		   size_t compressed_size, void *__restrict uncompressed_data,

 		   size_t uncompressed_size);

+

+#endif /* _LINUX_NTFS3_LIB_LIB_H */

-- 

2.31.1