From 1e55eeea95ba31ef458a04b9ad162d72b5bd6aca Mon Sep 17 00:00:00 2001
From: Quentin Kaiser <quentin.kaiser@onekey.com>
Date: Tue, 21 Feb 2023 22:33:24 +0100
Subject: [PATCH] chore(deps): improve LZMA dependencies resolution during
 pre-processing.

On OSX, multiple types are not automatically resolved during
pre-processing because different implementations of LZMA in the LZMA
directory have a file named "LZMA.h".

Fixed by renaming them to "LZMA2.h" and "LZMA3.h" while adapting the
include macros.

Discussion: https://github.com/devttys0/sasquatch/issues/6#issuecomment-430581904
---
 .../LZMA/lzmadaptive/C/7zip/Compress/LZMA/{LZMA.h => LZMA2.h}   | 0
 .../LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h         | 2 +-
 .../LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h         | 2 +-
 squashfs-tools/LZMA/lzmalt/{LZMA.h => LZMA3.h}                  | 0
 squashfs-tools/LZMA/lzmalt/LZMADecoder.h                        | 2 +-
 squashfs-tools/xz_wrapper.h                                     | 1 +
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/{LZMA.h => LZMA2.h} (100%)
 rename squashfs-tools/LZMA/lzmalt/{LZMA.h => LZMA3.h} (100%)

diff --git a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMA.h b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMA2.h
similarity index 100%
rename from squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMA.h
rename to squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMA2.h
diff --git a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h
index ee92f552..0e50394a 100644
--- a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h
+++ b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h
@@ -9,7 +9,7 @@
 #include "../LZ/LZOutWindow.h"
 #include "../RangeCoder/RangeCoderBitTree.h"
 
-#include "LZMA.h"
+#include "LZMA2.h"
 
 namespace NCompress {
 namespace NLZMA {
diff --git a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h
index 4c5f5c14..0b42483e 100644
--- a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h
+++ b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h
@@ -9,7 +9,7 @@
 #include "../LZ/IMatchFinder.h"
 #include "../RangeCoder/RangeCoderBitTree.h"
 
-#include "LZMA.h"
+#include "LZMA2.h"
 
 namespace NCompress {
 namespace NLZMA {
diff --git a/squashfs-tools/LZMA/lzmalt/LZMA.h b/squashfs-tools/LZMA/lzmalt/LZMA3.h
similarity index 100%
rename from squashfs-tools/LZMA/lzmalt/LZMA.h
rename to squashfs-tools/LZMA/lzmalt/LZMA3.h
diff --git a/squashfs-tools/LZMA/lzmalt/LZMADecoder.h b/squashfs-tools/LZMA/lzmalt/LZMADecoder.h
index 76fa536b..38a14c31 100644
--- a/squashfs-tools/LZMA/lzmalt/LZMADecoder.h
+++ b/squashfs-tools/LZMA/lzmalt/LZMADecoder.h
@@ -2,7 +2,7 @@
 #define __LZARITHMETIC_DECODER_H
 
 #include "WindowOut.h"
-#include "LZMA.h"
+#include "LZMA3.h"
 #include "LenCoder.h"
 #include "LiteralCoder.h"
 
diff --git a/squashfs-tools/xz_wrapper.h b/squashfs-tools/xz_wrapper.h
index af601ded..08262345 100644
--- a/squashfs-tools/xz_wrapper.h
+++ b/squashfs-tools/xz_wrapper.h
@@ -25,6 +25,7 @@
  */
 
 #include "endian_compat.h"
+#include <lzma.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN || defined FIX_BE
 extern unsigned int inswap_le32(unsigned int);