From f5804db2b055a95c9099f1f809045a3107439477 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Sun, 28 Jun 2020 19:46:12 +0200 Subject: [PATCH] Android compilation fixes --- android/edge_android.c | 2 +- android/tuntap_android.c | 2 +- include/portable_endian.h | 2 +- src/edge_utils.c | 2 +- src/speck.c | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/android/edge_android.c b/android/edge_android.c index b61d609..f502e2b 100644 --- a/android/edge_android.c +++ b/android/edge_android.c @@ -16,7 +16,7 @@ * */ -#include "../n2n.h" +#include "n2n.h" #ifdef __ANDROID_NDK__ #include diff --git a/android/tuntap_android.c b/android/tuntap_android.c index 5a1c711..ead4ba4 100644 --- a/android/tuntap_android.c +++ b/android/tuntap_android.c @@ -15,7 +15,7 @@ * along with this program; if not, see */ -#include "../n2n.h" +#include "n2n.h" #ifdef __ANDROID_NDK__ #include diff --git a/include/portable_endian.h b/include/portable_endian.h index 1b27491..9c46ffe 100644 --- a/include/portable_endian.h +++ b/include/portable_endian.h @@ -31,7 +31,7 @@ # include # include /* See http://linux.die.net/man/3/endian */ -# if defined(htobe16) && defined(htole16) && defined(be16toh) && defined(le16toh) && defined(htobe32) && defined(htole32) && defined(be32toh) && defined(htole32) && defined(htobe64) && defined(htole64) && defined(be64) && defined(le64) +# if defined(htobe16) && defined(htole16) && defined(be16toh) && defined(le16toh) && defined(htobe32) && defined(htole32) && defined(be32toh) && defined(htole32) && defined(htobe64) && defined(htole64) && defined(htobe64) && defined(be64toh) && defined(htole64) && defined(le64toh) /* Do nothing. The macros we need already exist. */ # elif !defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 9))) # include diff --git a/src/edge_utils.c b/src/edge_utils.c index cac7cbb..be03405 100644 --- a/src/edge_utils.c +++ b/src/edge_utils.c @@ -2559,5 +2559,5 @@ int quick_edge_init(char *device_name, char *community_name, /* ************************************** */ #ifdef __ANDROID_NDK__ -#include "android/edge_android.c" +#include "../android/edge_android.c" #endif diff --git a/src/speck.c b/src/speck.c index 79d93a0..a5ced78 100644 --- a/src/speck.c +++ b/src/speck.c @@ -5,8 +5,6 @@ #include #include "portable_endian.h" -#ifndef __ANDROID_NDK__ - #include "speck.h" #if defined (__AVX2__) // AVX support ---------------------------------------------------- @@ -786,5 +784,3 @@ int main (int argc, char* argv[]) { fprintf (stdout, "SPECK SELF TEST RESULT: %u\n", speck_test (0,NULL)); } */ - -#endif \ No newline at end of file