enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Android compilation fixes

Browse Source
This commit is contained in:
emanuele-f 2020-06-28 19:46:12 +02:00
parent 0b4d36f7bd
commit f5804db2b0
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/edge_android.c
View File

@ -16,7 +16,7 @@
*
*/
#include "../n2n.h"
#include "n2n.h"
#ifdef __ANDROID_NDK__
#include <edge_jni/edge_jni.h>

2
android/tuntap_android.c
View File

@ -15,7 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>
*/
#include "../n2n.h"
#include "n2n.h"
#ifdef __ANDROID_NDK__
#include <tun2tap/tun2tap.h>

2
include/portable_endian.h
View File

@ -31,7 +31,7 @@
# include <endian.h>
# include <features.h>
/* 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 <arpa/inet.h>

2
src/edge_utils.c
View File

@ -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

4
src/speck.c
View File

@ -5,8 +5,6 @@
#include <stdlib.h>
#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