From 9db320577aa38a173cfb8bd634eb83e27d0f1aeb Mon Sep 17 00:00:00 2001 From: elecpower Date: Mon, 15 Nov 2021 06:27:56 +1100 Subject: [PATCH] Move miniz include to categorized storage --- companion/src/storage/categorized.cpp | 1 + companion/src/storage/etx.cpp | 1 - companion/src/storage/otx.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/companion/src/storage/categorized.cpp b/companion/src/storage/categorized.cpp index d659ae81f..5786b3127 100644 --- a/companion/src/storage/categorized.cpp +++ b/companion/src/storage/categorized.cpp @@ -20,6 +20,7 @@ #include "categorized.h" #include "firmwares/opentx/opentxinterface.h" +#include "miniz.c" // Can only be included once! bool CategorizedStorageFormat::load(RadioData & radioData) { diff --git a/companion/src/storage/etx.cpp b/companion/src/storage/etx.cpp index a20365fcf..051bf8391 100644 --- a/companion/src/storage/etx.cpp +++ b/companion/src/storage/etx.cpp @@ -19,7 +19,6 @@ */ #include "etx.h" -#include "miniz.c" // Can only be included once! #include #define MZ_ALLOCATION_SIZE (32*1024) diff --git a/companion/src/storage/otx.cpp b/companion/src/storage/otx.cpp index caf87c22a..44dbd9ef2 100644 --- a/companion/src/storage/otx.cpp +++ b/companion/src/storage/otx.cpp @@ -19,7 +19,6 @@ */ #include "otx.h" -//#include "miniz.c" Can only be included once refer etx.cpp #include #define MZ_ALLOCATION_SIZE (32*1024)