Skip to content

Commit b38ace0

Browse files
committed
add websocket android patch
1 parent 2e1840e commit b38ace0

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

contrib/src/websockets/rules.mak

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,20 @@ $(TARBALLS)/libwebsockets-1.3-chrome37-firefox30.zip:
1010

1111
websockets: libwebsockets-1.3-chrome37-firefox30.zip .sum-websockets
1212
$(UNPACK)
13+
ifdef HAVE_ANDROID
14+
$(APPLY) $(SRC)/websockets/websocket_android.patch
15+
endif
1316
$(MOVE)
1417

1518
ifdef HAVE_TIZEN
1619
EX_ECFLAGS = -fPIC
1720
endif
1821

22+
#FIXME: we need to pass __ANDROID__ to cflags
23+
# ifdef HAVE_ANDROID
24+
# EX_ECFLAGS = -D__ANDROID__
25+
# endif
26+
1927
DEPS_websockets = zlib $(DEPS_zlib)
2028

2129
.websockets: websockets .zlib toolchain.cmake
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
2+
index 6fae889..97c0d0e 100755
3+
--- a/lib/private-libwebsockets.h
4+
+++ b/lib/private-libwebsockets.h
5+
@@ -105,7 +105,7 @@
6+
#else
7+
#include <ifaddrs.h>
8+
#endif
9+
-#include <sys/syslog.h>
10+
+#include <syslog.h>
11+
#include <sys/un.h>
12+
#include <sys/socket.h>
13+
#include <netdb.h>

0 commit comments

Comments
 (0)