From 0c0f650455e29454a967ee2874ddba36942e2588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Sch=C3=BCmann?= Date: Thu, 26 Mar 2015 20:40:58 +0000 Subject: MirOTR: Libgcrypt, 64bit fix, patch submitted to Libgcrypt devs git-svn-id: http://svn.miranda-ng.org/main/trunk@12509 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/DEPENDENCIES.txt | 1 + plugins/MirOTR/Libgcrypt/random/rndw32.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/DEPENDENCIES.txt b/plugins/MirOTR/DEPENDENCIES.txt index b1adc82e2b..eb94a0efc8 100644 --- a/plugins/MirOTR/DEPENDENCIES.txt +++ b/plugins/MirOTR/DEPENDENCIES.txt @@ -48,6 +48,7 @@ HOW_TO_UPDATE_DEPENDENCIES - copy .c,.h,.def,.m4 and libgcrypt-config from src/ to our Libgcrypt - cipher/cipher-ccm.c: replace "tmp[blocksize];" with "tmp[16];" as MSVC is quite dumb - cipher/stribog.c: replace "u64 Z[8] = {};" with "u64 Z[8] = {0};" + - random/rndw32.c: line 891 "DWORD minimumWorkingSetSize, maximumWorkingSetSize;", replace DWORD with proper SIZE_T to fix 64bit problem (patch submitted to Libgcrypt) - copy config.h to our Libgcrypt custom/ - config.h: see CONVERT_CONFIG_H_FROM_GCC_TO_MSVC diff --git a/plugins/MirOTR/Libgcrypt/random/rndw32.c b/plugins/MirOTR/Libgcrypt/random/rndw32.c index c495131de8..71cca0364c 100644 --- a/plugins/MirOTR/Libgcrypt/random/rndw32.c +++ b/plugins/MirOTR/Libgcrypt/random/rndw32.c @@ -888,7 +888,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, { HANDLE handle; FILETIME creationTime, exitTime, kernelTime, userTime; - DWORD minimumWorkingSetSize, maximumWorkingSetSize; + SIZE_T minimumWorkingSetSize, maximumWorkingSetSize; handle = GetCurrentThread (); GetThreadTimes (handle, &creationTime, &exitTime, -- cgit v1.2.3