afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade websockets to 1.7.8 and enable support for IPV6.

This commit is contained in:
Wenhai Lin 2016-05-19 01:07:19 +08:00
parent 22961548a8
commit c7e49e2c3c
19 changed files with 105 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
android/arm64-v8a/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
android/arm64-v8a/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
android/arm64-v8a/libwebsockets.a
View File

Binary file not shown.

17
android/armeabi-v7a/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
android/armeabi-v7a/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
android/armeabi-v7a/libwebsockets.a
View File

Binary file not shown.

17
android/armeabi/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
android/armeabi/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
android/armeabi/libwebsockets.a
View File

Binary file not shown.

17
android/x86/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
android/x86/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
android/x86/libwebsockets.a
View File

Binary file not shown.

17
ios/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
ios/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
ios/libs/libwebsockets.a
View File

Binary file not shown.

17
mac/include/websockets/libwebsockets.h
View File

@ -146,10 +146,12 @@ struct sockaddr_in;
#define LWS_INVALID_FILE INVALID_HANDLE_VALUE #define LWS_INVALID_FILE INVALID_HANDLE_VALUE
#define LWS_O_RDONLY _O_RDONLY #define LWS_O_RDONLY _O_RDONLY
#define snprintf _snprintf
#else /* NOT WIN32 */ #else /* NOT WIN32 */
#include <unistd.h> #include <unistd.h>
#if defined(__NetBSD__) #if defined(__NetBSD__) || defined(__FreeBSD__)
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -166,8 +168,15 @@ struct sockaddr_in;
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
#define LWS_VISIBLE __attribute__((visibility("default")))
/* warn_unused_result attribute only supported by GCC 3.4 or later */
#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define LWS_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
#define LWS_WARN_UNUSED_RESULT
#endif
#define LWS_VISIBLE __attribute__((visibility("default")))
#define LWS_WARN_DEPRECATED __attribute__ ((deprecated)) #define LWS_WARN_DEPRECATED __attribute__ ((deprecated))
#else #else
#define LWS_VISIBLE #define LWS_VISIBLE
@ -1492,7 +1501,7 @@ lws_ev_sigint_cb(struct ev_loop *loop, struct ev_signal *watcher, int revents);
#endif /* LWS_USE_LIBEV */ #endif /* LWS_USE_LIBEV */
#ifdef LWS_USE_LIBUV #ifdef LWS_USE_LIBUV
typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents); typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int signum);
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int
lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint, lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
@ -1511,7 +1520,7 @@ LWS_VISIBLE LWS_EXTERN uv_loop_t *
lws_uv_getloop(struct lws_context *context, int tsi); lws_uv_getloop(struct lws_context *context, int tsi);
LWS_VISIBLE void LWS_VISIBLE void
lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents); lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int signum);
#endif /* LWS_USE_LIBUV */ #endif /* LWS_USE_LIBUV */
LWS_VISIBLE LWS_EXTERN int LWS_VISIBLE LWS_EXTERN int

8
mac/include/websockets/lws_config.h
View File

@ -15,16 +15,16 @@
/* #undef USE_OLD_CYASSL */ /* #undef USE_OLD_CYASSL */
/* The Libwebsocket version */ /* The Libwebsocket version */
#define LWS_LIBRARY_VERSION "1.7.4" #define LWS_LIBRARY_VERSION "1.7.8"
#define LWS_LIBRARY_VERSION_MAJOR 1 #define LWS_LIBRARY_VERSION_MAJOR 1
#define LWS_LIBRARY_VERSION_MINOR 7 #define LWS_LIBRARY_VERSION_MINOR 7
#define LWS_LIBRARY_VERSION_PATCH 4 #define LWS_LIBRARY_VERSION_PATCH 8
/* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
#define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH
/* The current git commit hash that we're building from */ /* The current git commit hash that we're building from */
#define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-47-g7179094" #define LWS_BUILD_HASH "linwenhai@LindeMacBook-Pro.local-v3.4-49-g9369eea"
/* Build with OpenSSL support */ /* Build with OpenSSL support */
/* #undef LWS_OPENSSL_SUPPORT */ /* #undef LWS_OPENSSL_SUPPORT */
@ -45,7 +45,7 @@
/* #undef LWS_USE_LIBUV */ /* #undef LWS_USE_LIBUV */
/* Build with support for ipv6 */ /* Build with support for ipv6 */
/* #undef LWS_USE_IPV6 */ #define LWS_USE_IPV6
/* Build with support for HTTP2 */ /* Build with support for HTTP2 */
/* #undef LWS_USE_HTTP2 */ /* #undef LWS_USE_HTTP2 */

BIN
mac/libs/libwebsockets.a
View File

Binary file not shown.

6
versions.txt
View File

@ -1,8 +1,8 @@
websockets websockets
mac: 1.7.4 mac: 1.7.8
win32: win32:
ios: 1.7.4 ios: 1.7.8
android: 1.7.4 android: 1.7.8
png png
mac: 1.6.21 mac: 1.6.21