diff options
Diffstat (limited to 'patches/zano/0002-fix-mingw-build-issues.patch')
| -rw-r--r-- | patches/zano/0002-fix-mingw-build-issues.patch | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/patches/zano/0002-fix-mingw-build-issues.patch b/patches/zano/0002-fix-mingw-build-issues.patch index cbaa537..b4d346f 100644 --- a/patches/zano/0002-fix-mingw-build-issues.patch +++ b/patches/zano/0002-fix-mingw-build-issues.patch @@ -1,37 +1,15 @@ -From 9e55bde82de70a12d68249233d2d571bf388a409 Mon Sep 17 00:00:00 2001 +From 4e9ac1ac20c243d8cdccc2a4941f16e09951454b Mon Sep 17 00:00:00 2001 From: cyan <cyjan@mrcyjanek.net> Date: Sun, 3 Nov 2024 08:59:22 +0000 Subject: [PATCH 2/7] fix mingw build issues --- - contrib/epee/include/misc_os_dependent.h | 4 ++-- - src/common/callstack_helper.cpp | 2 +- - src/crypto/ecrypt-config.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) + src/common/callstack_helper.cpp | 2 +- + src/crypto/ecrypt-config.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h -index c06e5d94..a2a979b9 100644 ---- a/contrib/epee/include/misc_os_dependent.h -+++ b/contrib/epee/include/misc_os_dependent.h -@@ -110,14 +110,14 @@ namespace misc_utils - } - - --#if defined(__GNUC__) && !defined(__ANDROID__) -+#if defined(__GNUC__) && !defined(__ANDROID__) && !defined(_WIN32) - #include <execinfo.h> - #include <boost/core/demangle.hpp> - #endif - inline std::string print_trace_default() - { - std::stringstream ss; --#if defined(__GNUC__) && !defined(__ANDROID__) -+#if defined(__GNUC__) && !defined(__ANDROID__) && !defined(_WIN32) - ss << std::endl << "STACK" << std::endl; - const size_t max_depth = 100; - size_t stack_depth; diff --git a/src/common/callstack_helper.cpp b/src/common/callstack_helper.cpp -index b84fe5a8..c9eae839 100644 +index 939dc929..b6614949 100644 --- a/src/common/callstack_helper.cpp +++ b/src/common/callstack_helper.cpp @@ -9,7 +9,7 @@ @@ -57,5 +35,5 @@ index 9176de17..8b488135 100644 #define I64T __int64 #define U64C(v) (v##ui64) -- -2.48.1 +2.51.0 |