Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorDanny Su <contact@dannysu.com>2016-12-21 02:41:15 +0300
committerJonathan White <droidmonkey@users.noreply.github.com>2016-12-21 02:41:15 +0300
commit63a1b49745ab038aadd70bbfa3f97acec88f2a20 (patch)
treed3e8e7dcf41a8cb3bd6e18266e4f42cb611901ab /utils
parent9547ac0afd3cc6eb714925cdb7e2e4a07e1443c0 (diff)
Fix build for 64-bit Windows (#130)
Building on 64-bit Windows gets to 99% and fails on this particular file due to the `stdafx.h` inclusion. The macro in `entropy-meter.cpp` is different than `src/zxcvbn/zxcvbn.cpp`. After copying the macro from `zxcvbn.cpp` and rebuilding, the Windows build succeeded.
Diffstat (limited to 'utils')
-rw-r--r--utils/entropy-meter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/entropy-meter.cpp b/utils/entropy-meter.cpp
index 3266ec55b..a5e6e50e9 100644
--- a/utils/entropy-meter.cpp
+++ b/utils/entropy-meter.cpp
@@ -13,8 +13,10 @@ See zxcvbn/zxcvbn.cpp for complete COPYRIGHT Notice
/* For pre-compiled headers under windows */
#ifdef _WIN32
+#ifndef __MINGW32__
#include "stdafx.h"
#endif
+#endif
static void calculate(const char *pwd, int advanced)
{