summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-10-13 12:45:33 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-10-13 12:46:41 (GMT)
commit97551f28e3642faeff0ae77dde48cbd03cee3f1a (patch)
tree7502a587ea7d61e0cd28bfa95a1464dc68b28b59 /3rdParty/LibNATPMP/src/libnatpmp
parent092c5edea4290db0be22f26898e483d9e39be8cc (diff)
downloadswift-contrib-97551f28e3642faeff0ae77dde48cbd03cee3f1a.zip
swift-contrib-97551f28e3642faeff0ae77dde48cbd03cee3f1a.tar.bz2
Apply MiniUPNP and NatPMP Android patches
Change-Id: Iaa8c564f21d1f7354f597ceca478e52fae6c774e
Diffstat (limited to '3rdParty/LibNATPMP/src/libnatpmp')
-rw-r--r--3rdParty/LibNATPMP/src/libnatpmp/getgateway.h5
-rw-r--r--3rdParty/LibNATPMP/src/libnatpmp/natpmp.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h
index 9432528..51dadb7 100644
--- a/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h
+++ b/3rdParty/LibNATPMP/src/libnatpmp/getgateway.h
@@ -27,6 +27,11 @@ typedef unsigned short uint16_t;
#endif
#include "declspec.h"
+#ifdef ANDROID
+#include <arpa/inet.h>
+#define in_addr_t uint32_t
+#endif
+
/* getdefaultgateway() :
* return value :
* 0 : success
diff --git a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h
index 1175b58..c870371 100644
--- a/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h
+++ b/3rdParty/LibNATPMP/src/libnatpmp/natpmp.h
@@ -39,6 +39,12 @@ typedef unsigned short uint16_t;
#include <netinet/in.h>
#endif
+#ifdef ANDROID
+#include <arpa/inet.h>
+#define in_addr_t uint32_t
+#endif
+
+
typedef struct {
int s; /* socket */
in_addr_t gateway; /* default gateway (IPv4) */