diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:21:47 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:21:47 +0000 |
commit | 3788dc488cabbdd130fde570b87c80a43b380467 (patch) | |
tree | dc6c42b0486a718499f44207bac0580ff6964c26 | |
parent | a65c0283b21d5ceafdc0e6893e33f2032982df52 (diff) | |
parent | c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 (diff) | |
download | scrypt-3788dc488cabbdd130fde570b87c80a43b380467.tar.gz |
Snap for 10447354 from c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 to mainline-networking-releaseaml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000android14-mainline-networking-release
Change-Id: Id91e98e246fe8c3ff8b02b0b67b0e8c20778d537
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | config.h | 2 | ||||
-rw-r--r-- | lib/crypto/crypto_scrypt-sse.c | 2 |
3 files changed, 9 insertions, 0 deletions
@@ -53,6 +53,11 @@ cc_library_static { sdk_version: "17", host_supported: true, vendor_available: true, + target: { + windows: { + enabled: true, + }, + }, } cc_test { @@ -21,7 +21,9 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `posix_memalign' function. */ +#ifndef _WIN32 #define HAVE_POSIX_MEMALIGN 1 +#endif /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 diff --git a/lib/crypto/crypto_scrypt-sse.c b/lib/crypto/crypto_scrypt-sse.c index dd18f29..c50204d 100644 --- a/lib/crypto/crypto_scrypt-sse.c +++ b/lib/crypto/crypto_scrypt-sse.c @@ -29,7 +29,9 @@ #include "scrypt_platform.h" #include <sys/types.h> +#ifndef _WIN32 #include <sys/mman.h> +#endif #include <emmintrin.h> #include <errno.h> |