[FarGroup/FarManager] master: Correction of 6626.2 (7bbaaa0e3)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Jan 17, 2026, 6:31:03 PMJan 17
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/7bbaaa0e30d29fc94b6babf6f93ca79480c539a1

>---------------------------------------------------------------

commit 7bbaaa0e30d29fc94b6babf6f93ca79480c539a1
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sat Jan 17 23:14:43 2026 +0000

Correction of 6626.2


>---------------------------------------------------------------

7bbaaa0e30d29fc94b6babf6f93ca79480c539a1
far/common/shims_post.hpp | 1 +
far/exception_handler.cpp | 3 +++
far/far.vcxproj | 6 ++++++
far/makefile_vc | 4 ++++
4 files changed, 14 insertions(+)

diff --git a/far/common/shims_post.hpp b/far/common/shims_post.hpp
index 6ca8cd750..a159e012a 100644
--- a/far/common/shims_post.hpp
+++ b/far/common/shims_post.hpp
@@ -37,6 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "compiler.hpp"
+#include "library.hpp"

#include <version>

diff --git a/far/exception_handler.cpp b/far/exception_handler.cpp
index 85563802d..1f6858f85 100644
--- a/far/exception_handler.cpp
+++ b/far/exception_handler.cpp
@@ -2401,7 +2401,10 @@ extern "C" void _wassert(wchar_t const* Message, wchar_t const* File, unsigned L
constexpr auto real_wassert = _wassert;
#pragma pop_macro("_wassert")

+WARNING_PUSH()
+WARNING_DISABLE_MSC(4273) // 'function': inconsistent dll linkage
void far_assert(wchar_t const* const Message, wchar_t const* const File, unsigned const Line)
+WARNING_POP()
{
switch (assert_handler_impl(Message, { encoding::utf8::get_bytes(File).c_str(), "assert", Line }))
{
diff --git a/far/far.vcxproj b/far/far.vcxproj
index ac97f543f..c8ab0594e 100644
--- a/far/far.vcxproj
+++ b/far/far.vcxproj
@@ -48,6 +48,12 @@ if not exist $(BootstrapDir) mkdir $(BootstrapDir)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>

+ <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Debug_ASAN'">
+ <Link>
+ <AdditionalOptions>/ignore:4286</AdditionalOptions>
+ </Link>
+ </ItemDefinitionGroup>
+
<ItemGroup>
<CustomBuild Include="api_test.c">
<Command>echo testing C plugin API
diff --git a/far/makefile_vc b/far/makefile_vc
index 3b1f57e07..02b243232 100644
--- a/far/makefile_vc
+++ b/far/makefile_vc
@@ -250,6 +250,10 @@ RFLAGS = $(RFLAGS) $(ADDINCLUDE)
CPPFLAGS = $(CPPFLAGS) /D "ENABLE_TESTS"
!endif

+!ifdef DEBUG
+LNKFLAGS=$(LNKFLAGS) /ignore:4286
+!endif
+
ALL: AllDirs lng depfile include docs $(TEST_OBJS)
$(MAKE) /nologo /f makefile_vc build USEDEPS=1



Reply all
Reply to author
Forward
0 new messages