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/LibMiniUPnPc/src/miniupnpc
parent092c5edea4290db0be22f26898e483d9e39be8cc (diff)
downloadswift-97551f28e3642faeff0ae77dde48cbd03cee3f1a.zip
swift-97551f28e3642faeff0ae77dde48cbd03cee3f1a.tar.bz2
Apply MiniUPNP and NatPMP Android patches
Change-Id: Iaa8c564f21d1f7354f597ceca478e52fae6c774e
Diffstat (limited to '3rdParty/LibMiniUPnPc/src/miniupnpc')
-rw-r--r--3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c b/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c
index 87f6155..0c31416 100644
--- a/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c
+++ b/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c
@@ -44,6 +44,10 @@
#define MIN(x,y) (((x)<(y))?(x):(y))
#endif
+#ifdef __ANDROID__
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
#include "miniupnpcstrings.h"
#include "miniwget.h"
#include "connecthostport.h"