libwebsockets.h (2.2.1) | | libwebsockets.h (2.2.2) |
| | |
skipping to change at line 36 ¶ | | skipping to change at line 36 ¶ |
| | |
#ifdef __cplusplus | | #ifdef __cplusplus |
#include <cstddef> | | #include <cstddef> |
#include <cstdarg> | | #include <cstdarg> |
# | | # |
extern "C" { | | extern "C" { |
#else | | #else |
#include <stdarg.h> | | #include <stdarg.h> |
#endif | | #endif |
| | |
static inline int lws_is_be(void) { | | |
const int probe = ~0xff; | | |
| | |
return *(const char *)&probe; | | |
} | | |
| | |
#if defined(LWS_WITH_ESP8266) | | #if defined(LWS_WITH_ESP8266) |
struct sockaddr_in; | | struct sockaddr_in; |
#define LWS_POSIX 0 | | #define LWS_POSIX 0 |
#else | | #else |
#define LWS_POSIX 1 | | #define LWS_POSIX 1 |
#endif | | #endif |
| | |
#include "lws_config.h" | | #include "lws_config.h" |
| | |
#if defined(WIN32) || defined(_WIN32) | | #if defined(WIN32) || defined(_WIN32) |
| | |
skipping to change at line 102 ¶ | | skipping to change at line 96 ¶ |
#define LWS_O_RDONLY _O_RDONLY | | #define LWS_O_RDONLY _O_RDONLY |
| | |
#if !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER < 1900) /* Vis
ual Studio 2015 already defines this in <stdio.h> */ | | #if !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER < 1900) /* Vis
ual Studio 2015 already defines this in <stdio.h> */ |
#define lws_snprintf _snprintf | | #define lws_snprintf _snprintf |
#endif | | #endif |
| | |
#ifndef __func__ | | #ifndef __func__ |
#define __func__ __FUNCTION__ | | #define __func__ __FUNCTION__ |
#endif | | #endif |
| | |
| | #if !defined(__MINGW32__) &&(!defined(_MSC_VER) || _MSC_VER < 1900) && !def |
| | ined(snprintf) |
| | #define snprintf(buf,len, format,...) _snprintf_s(buf, len,len, format, __V |
| | A_ARGS__) |
| | #endif |
| | |
#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 294 ¶ | | skipping to change at line 292 ¶ |
#define lwsl_debug(...) do {} while(0) | | #define lwsl_debug(...) do {} while(0) |
#define lwsl_parser(...) do {} while(0) | | #define lwsl_parser(...) do {} while(0) |
#define lwsl_header(...) do {} while(0) | | #define lwsl_header(...) do {} while(0) |
#define lwsl_ext(...) do {} while(0) | | #define lwsl_ext(...) do {} while(0) |
#define lwsl_client(...) do {} while(0) | | #define lwsl_client(...) do {} while(0) |
#define lwsl_latency(...) do {} while(0) | | #define lwsl_latency(...) do {} while(0) |
#define lwsl_hexdump(a, b) | | #define lwsl_hexdump(a, b) |
| | |
#endif | | #endif |
| | |
| | static LWS_INLINE int lws_is_be(void) { |
| | const int probe = ~0xff; |
| | |
| | return *(const char *)&probe; |
| | } |
| | |
/** | | /** |
* lws_set_log_level() - Set the logging bitfield | | * lws_set_log_level() - Set the logging bitfield |
* \param level: OR together the LLL_ debug contexts you want output
from | | * \param level: OR together the LLL_ debug contexts you want output
from |
* \param log_emit_function: NULL to leave it as it is, or a user-supplie
d | | * \param log_emit_function: NULL to leave it as it is, or a user-supplie
d |
* function to perform log string emission instead of | | * function to perform log string emission instead of |
* the default stderr one. | | * the default stderr one. |
* | | * |
* log level defaults to "err", "warn" and "notice" contexts enabled an
d | | * log level defaults to "err", "warn" and "notice" contexts enabled an
d |
* emission on stderr. | | * emission on stderr. |
*/ | | */ |
| | |
skipping to change at line 4321 ¶ | | skipping to change at line 4325 ¶ |
#endif | | #endif |
| | |
#define LWS_FOP_FLAGS_MASK ((1 << 23) - 1) | | #define LWS_FOP_FLAGS_MASK ((1 << 23) - 1) |
#define LWS_FOP_FLAG_COMPR_ACCEPTABLE_GZIP (1 << 24) | | #define LWS_FOP_FLAG_COMPR_ACCEPTABLE_GZIP (1 << 24) |
#define LWS_FOP_FLAG_COMPR_IS_GZIP (1 << 25) | | #define LWS_FOP_FLAG_COMPR_IS_GZIP (1 << 25) |
#define LWS_FOP_FLAG_MOD_TIME_VALID (1 << 26) | | #define LWS_FOP_FLAG_MOD_TIME_VALID (1 << 26) |
#define LWS_FOP_FLAG_VIRTUAL (1 << 27) | | #define LWS_FOP_FLAG_VIRTUAL (1 << 27) |
| | |
struct lws_plat_file_ops; | | struct lws_plat_file_ops; |
| | |
#if defined(WIN32) || defined(_WIN32) | | #if (defined(WIN32) || defined(_WIN32)) && !defined(__MINGW32__) |
/* ... */ | | /* ... */ |
#if !defined(ssize_t) | | #if !defined(ssize_t) |
typedef SSIZE_T ssize_t; | | typedef SSIZE_T ssize_t; |
#endif | | #endif |
#endif | | #endif |
| | |
#if defined(LWS_HAVE_STDINT_H) | | #if defined(LWS_HAVE_STDINT_H) |
#include <stdint.h> | | #include <stdint.h> |
#else | | #else |
#if defined(WIN32) || defined(_WIN32) | | #if defined(WIN32) || defined(_WIN32) |
| | |
End of changes. 4 change blocks. |
7 lines changed or deleted | | 13 lines changed or added |
|
lws_config.h (2.2.1) | | lws_config.h (2.2.2) |
/* lws_config.h Generated from lws_config.h.in */ | | /* lws_config.h Generated from lws_config.h.in */ |
| | |
#ifndef NDEBUG | | #ifndef NDEBUG |
#ifndef _DEBUG | | #ifndef _DEBUG |
#define _DEBUG | | #define _DEBUG |
#endif | | #endif |
#endif | | #endif |
| | |
#define LWS_INSTALL_DATADIR "/home/agreen/installed/libwebsockets/2.2.1/sha
re" | | #define LWS_INSTALL_DATADIR "/home/agreen/installed/libwebsockets/2.2.2/sha
re" |
| | |
/* 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 */ |
/* #undef LWS_USE_BORINGSSL */ | | /* #undef LWS_USE_BORINGSSL */ |
| | |
/* #undef LWS_USE_MBEDTLS */ | | /* #undef LWS_USE_MBEDTLS */ |
/* #undef LWS_USE_POLARSSL */ | | /* #undef LWS_USE_POLARSSL */ |
/* #undef LWS_WITH_ESP8266 */ | | /* #undef LWS_WITH_ESP8266 */ |
/* #undef LWS_WITH_ESP32 */ | | /* #undef LWS_WITH_ESP32 */ |
| | |
/* #undef LWS_WITH_PLUGINS */ | | /* #undef LWS_WITH_PLUGINS */ |
/* #undef LWS_WITH_NO_LOGS */ | | /* #undef LWS_WITH_NO_LOGS */ |
| | |
/* The Libwebsocket version */ | | /* The Libwebsocket version */ |
#define LWS_LIBRARY_VERSION "2.2.0" | | #define LWS_LIBRARY_VERSION "2.2.2" |
| | |
#define LWS_LIBRARY_VERSION_MAJOR 2 | | #define LWS_LIBRARY_VERSION_MAJOR 2 |
#define LWS_LIBRARY_VERSION_MINOR 2 | | #define LWS_LIBRARY_VERSION_MINOR 2 |
#define LWS_LIBRARY_VERSION_PATCH 0 | | #define LWS_LIBRARY_VERSION_PATCH 2 |
/* 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 */ |
| | |
skipping to change at line 130 ¶ | | skipping to change at line 130 ¶ |
/* #undef LWS_WITH_SMTP */ | | /* #undef LWS_WITH_SMTP */ |
| | |
/* OPTEE */ | | /* OPTEE */ |
/* #undef LWS_PLAT_OPTEE */ | | /* #undef LWS_PLAT_OPTEE */ |
| | |
/* ZIP FOPS */ | | /* ZIP FOPS */ |
#define LWS_WITH_ZIP_FOPS | | #define LWS_WITH_ZIP_FOPS |
#define LWS_HAVE_STDINT_H | | #define LWS_HAVE_STDINT_H |
| | |
/* #undef LWS_FALLBACK_GETHOSTBYNAME */ | | /* #undef LWS_FALLBACK_GETHOSTBYNAME */ |
| | |
| | /* OpenSSL various APIs */ |
| | |
| | #define LWS_HAVE_TLS_CLIENT_METHOD |
| | #define LWS_HAVE_TLSV1_2_CLIENT_METHOD |
| | |
End of changes. 4 change blocks. |
3 lines changed or deleted | | 3 lines changed or added |
|