Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-05-03 04:44:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1968

Browse source 
5e5b8512 Fix obsolete OpenSSL API usage (hyc)
6c72d6a0 Fix Android recognition (hyc)
e65d66fe Fix ARM64 identification (hyc)
a4673218 Clean up ARMv8-a aes_expand_key() (hyc)
a3d77901 Fix block_longhash_worker thread (hyc)
This commit is contained in:
Riccardo Spagni 2017-04-24 10:46:23 +02:00
commit 865bb03ecf
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
external/db_drivers/liblmdb/mdb.c vendored
View file

@ -137,7 +137,7 @@ typedef SSIZE_T ssize_t;
#include <unistd.h>
#endif
#if defined(__sun) || defined(ANDROID)
#if defined(__sun) || defined(__ANDROID__)
/* Most platforms have posix_memalign, older may only have memalign */
#define HAVE_MEMALIGN 1
#include <malloc.h>
@ -153,7 +153,7 @@ typedef SSIZE_T ssize_t;
# define MDB_USE_SYSV_SEM 1
# endif
# define MDB_FDATASYNC fsync
#elif defined(ANDROID)
#elif defined(__ANDROID__)
# define MDB_FDATASYNC fsync
#endif
@ -298,7 +298,7 @@ union semun {
*/
#ifndef MDB_USE_ROBUST
/* Android currently lacks Robust Mutex support. So does glibc < 2.4. */
# if defined(MDB_USE_POSIX_MUTEX) && (defined(ANDROID) || \
# if defined(MDB_USE_POSIX_MUTEX) && (defined(__ANDROID__) || \
(defined(__GLIBC__) && GLIBC_VER < 0x020004))
# define MDB_USE_ROBUST 0
# else

4
external/unbound/validator/val_secalgo.c vendored
View file

@ -345,7 +345,11 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
"EVP_PKEY_assign_DSA failed");
return 0;
}
#ifdef HAVE_EVP_DSS1
*digest_type = EVP_dss1();
#else
*digest_type = EVP_sha1();
#endif
break;
case LDNS_RSASHA1: