From 8989f14cd0585e596c3ac8a8a0bbbb2d251bb9e4 Mon Sep 17 00:00:00 2001 From: Alex Alabuzhev Date: Sat, 18 Jun 2016 15:10:12 +0000 Subject: [PATCH] fix 4715 --- far/changelog | 4 ++++ far/global.hpp | 2 +- far/sqlite.c | 6 ++---- far/vbuild.m4 | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/far/changelog b/far/changelog index 88e1e63bef..6eb1191020 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,7 @@ +drkns 18.06.2016 18:09:29 +0200 - build 4716 + +1. Уточнение 4715. + drkns 18.06.2016 13:55:55 +0200 - build 4715 1. С форума: неверная прорисовка часов с учетом региональных настроек. diff --git a/far/global.hpp b/far/global.hpp index bd26c79604..36369fc3f0 100644 --- a/far/global.hpp +++ b/far/global.hpp @@ -74,7 +74,7 @@ class global: noncopyable size_t PluginPanelsCount; BOOL ProcessException; string CurrentTime; - size_t LastShownTimeSize; + size_t LastShownTimeSize{}; const wchar_t *HelpFileMask; bool OnlyEditorViewerUsed; // -e or -v #if defined(SYSLOG) diff --git a/far/sqlite.c b/far/sqlite.c index 81edaec529..248299f350 100644 --- a/far/sqlite.c +++ b/far/sqlite.c @@ -31,10 +31,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "disable_warnings_in_std_begin.hpp" -#include -#include "disable_warnings_in_std_end.hpp" - #include "common/preprocessor.hpp" WARNING_PUSH(3) @@ -46,6 +42,8 @@ WARNING_DISABLE_GCC("-Warray-bounds") WARNING_DISABLE_GCC("-Wunused-but-set-variable") WARNING_DISABLE_GCC("-Wcast-qual") +#include + // SQlite 3.12 suddenly started using rand_s function, which depends on RtlGenRandom (SystemFunction036), which is not available in Win2k. // It would be better to hook only SystemFunction036 via our vc_crt_fix* facilities, but ucrt devs load it via GetProcAddress and call abort() if it's not available, // which is, of course, a truly splendid design decision, my hat's off to them. diff --git a/far/vbuild.m4 b/far/vbuild.m4 index 6b891dbec2..f9c1e96059 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4715)m4_dnl +m4_define(BUILD,4716)m4_dnl