Commit b81456fb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: Remove unneeded Android patch

parent 31d36130
diff -ruN live/groupsock/GroupsockHelper.cpp live.n/groupsock/GroupsockHelper.cpp
--- live/groupsock/GroupsockHelper.cpp 2012-08-20 09:33:31.000000000 +0200
+++ live.n/groupsock/GroupsockHelper.cpp 2012-08-20 10:58:28.598217212 +0200
@@ -466,7 +466,7 @@
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr;
-#ifdef ANDROID
+#ifdef __ANDROID__
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
@@ -490,7 +490,7 @@
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr;
-#ifdef ANDROID
+#ifdef __ANDROID__
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
......@@ -49,7 +49,6 @@ endif
cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
ifdef HAVE_ANDROID
cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
patch -p0 < $(SRC)/live555/android.patch
endif
mv live $@
touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment