| libwebsockets.h (1.7.8) | | libwebsockets.h (1.7.9) |
|---|
| | |
| skipping to change at line 148 ¶ | | skipping to change at line 148 ¶ |
|---|
| #else | | #else |
| #define LWS_EXTERN extern __declspec(dllimport) | | #define LWS_EXTERN extern __declspec(dllimport) |
| #endif | | #endif |
| #else | | #else |
| #define LWS_EXTERN | | #define LWS_EXTERN |
| #endif | | #endif |
| | |
| #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 | | #define lws_snprintf _snprintf |
| | |
| #else /* NOT WIN32 */ | | #else /* NOT WIN32 */ |
| #include <unistd.h> | | #include <unistd.h> |
| | |
| #if defined(__NetBSD__) || defined(__FreeBSD__) | | #if defined(__NetBSD__) || defined(__FreeBSD__) |
| #include <netinet/in.h> | | #include <netinet/in.h> |
| #endif | | #endif |
| | |
| #define LWS_INLINE inline | | #define LWS_INLINE inline |
| #define LWS_O_RDONLY O_RDONLY | | #define LWS_O_RDONLY O_RDONLY |
| | |
| skipping to change at line 1907 ¶ | | skipping to change at line 1907 ¶ |
|---|
| void *ext_user, const struct lws_ext_options *opts, | | void *ext_user, const struct lws_ext_options *opts, |
| const char *o, int len); | | const char *o, int len); |
| #endif | | #endif |
| | |
| /* | | /* |
| * custom allocator support | | * custom allocator support |
| */ | | */ |
| LWS_VISIBLE LWS_EXTERN void | | LWS_VISIBLE LWS_EXTERN void |
| lws_set_allocator(void *(*realloc)(void *ptr, size_t size)); | | lws_set_allocator(void *(*realloc)(void *ptr, size_t size)); |
| | |
|
| | /** |
| | * lws_snprintf(): lws_snprintf that truncates the returned length too |
| | * |
| | * \param str: destination buffer |
| | * \param size: bytes left in destination buffer |
| | * \param format: format string |
| | * \param ...: args for format |
| | * |
| | * This lets you correctly truncate buffers by concatenating lengths, if yo |
| | u |
| | * reach the limit the reported length doesn't exceed the limit. |
| | */ |
| | LWS_VISIBLE LWS_EXTERN int |
| | lws_snprintf(char *str, size_t size, const char *format, ...); |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
| #endif | | #endif |
| | |
| End of changes. 2 change blocks. |
|---|
| 1 lines changed or deleted | | 16 lines changed or added |
|---|
|
| lws_config.h (1.7.8) | | lws_config.h (1.7.9) |
|---|
| | |
| skipping to change at line 18 ¶ | | skipping to change at line 18 ¶ |
|---|
| | |
| /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. | | /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. |
| * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ | | * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ |
| /* #undef USE_WOLFSSL */ | | /* #undef USE_WOLFSSL */ |
| | |
| /* Also define to 1 (in addition to USE_WOLFSSL) when using the | | /* Also define to 1 (in addition to USE_WOLFSSL) when using the |
| (older) CyaSSL library */ | | (older) CyaSSL library */ |
| /* #undef USE_OLD_CYASSL */ | | /* #undef USE_OLD_CYASSL */ |
| | |
| /* The Libwebsocket version */ | | /* The Libwebsocket version */ |
|
| #define LWS_LIBRARY_VERSION "1.7.8" | | #define LWS_LIBRARY_VERSION "1.7.9" |
| | |
| #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 8 | | #define LWS_LIBRARY_VERSION_PATCH 9 |
| /* 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 "root@mail.warmcat.com-" | | #define LWS_BUILD_HASH "root@mail.warmcat.com-" |
| | |
| /* Build with OpenSSL support */ | | /* Build with OpenSSL support */ |
| #define LWS_OPENSSL_SUPPORT | | #define LWS_OPENSSL_SUPPORT |
| | |
| /* The client should load and trust CA root certs it finds in the OS */ | | /* The client should load and trust CA root certs it finds in the OS */ |
| | |
| End of changes. 2 change blocks. |
|---|
| 2 lines changed or deleted | | 2 lines changed or added |
|---|
|