diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:40:02 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:40:02 -0800 |
| commit | 2a996f492f933a6b7c27117904fecc447d0c2dc1 (patch) | |
| tree | 2ee0ebfd45b1c35fd16f037693406bb7d0fa93e7 /src/crypto/oaes_lib.c | |
| parent | Merge pull request #1509 (diff) | |
| parent | Build wallet with Android NDK (diff) | |
| download | monero-2a996f492f933a6b7c27117904fecc447d0c2dc1.tar.xz | |
Merge pull request #1510
80abc3bc Build wallet with Android NDK (MoroccanMalinois)
Diffstat (limited to 'src/crypto/oaes_lib.c')
| -rw-r--r-- | src/crypto/oaes_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c index f054a16f4..0afec6212 100644 --- a/src/crypto/oaes_lib.c +++ b/src/crypto/oaes_lib.c @@ -39,8 +39,8 @@ #include <malloc.h> #endif -// FreeBSD, and OpenBSD also don't need timeb.h -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) +// ANDROID, FreeBSD, and OpenBSD also don't need timeb.h +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__ANDROID__) #include <sys/timeb.h> #else #include <sys/time.h> @@ -499,7 +499,7 @@ static void oaes_get_seed( char buf[RANDSIZ + 1] ) #else static uint32_t oaes_get_seed(void) { - #if !defined(__FreeBSD__) && !defined(__OpenBSD__) + #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__ANDROID__) struct timeb timer; struct tm *gmTimer; char * _test = NULL; |