diff --git a/BUILD.gn b/BUILD.gn index ed913131579b493c249fbed15b4f20c8c6dea8c5..f94449a74a653e88855337b99ceefe30563087b6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -107,7 +107,7 @@ ohos_static_library("websockets") { "//third_party/libwebsockets/include/libwebsockets/abstract", "//third_party/libwebsockets/include/libwebsockets/abstract/protocols", - ################################################ + ################################################# "//third_party/libwebsockets/lib", "//third_party/libwebsockets/lib/plat", "//third_party/libwebsockets/lib/plat/windows", @@ -283,10 +283,10 @@ config("websockets_public_config") { platform == "linux_x64") { include_dirs += [ "//third_party/libwebsockets/lib/plat/unix" ] } - cflags = [ "-Wno-error=warnings" ] + cflags = [ "-Wno-error=#warnings" ] } -ohos_static_library("websocket_static") { +ohos_static_library("websockets_static") { sources = [ "//third_party/libwebsockets/lib/core-net/adopt.c", "//third_party/libwebsockets/lib/core-net/client/client.c", @@ -350,7 +350,7 @@ ohos_static_library("websocket_static") { "//third_party/libwebsockets/lib/plat/windows/windows-pipe.c", "//third_party/libwebsockets/lib/plat/windows/windows-plugins.c", "//third_party/libwebsockets/lib/plat/windows/windows-service.c", - "//third_party/libwebsockets/lib/plat/windows/windows-socket.c", + "//third_party/libwebsockets/lib/plat/windows/windows-sockets.c", ] } else if (platform == "mac_arm64" || platform == "mac_x64" || platform == "linux_x64") { diff --git a/include/lws_config.h b/include/lws_config.h index bd5ad7b68e81ea53cf25db87e6dd372f553ead10..18254f2bc1ce9daf23eaae6c7a369533d450b949 100644 --- a/include/lws_config.h +++ b/include/lws_config.h @@ -22,10 +22,10 @@ * IN THE SOFTWARE. */ -/* lws_config.h Generated from lws_config.h.in */ - #if OHOS_LIBWEBSOCKETS +/* lws_config.h Generated from lws_config.h.in */ + #ifndef NDEBUG #ifndef _DEBUG #define _DEBUG @@ -286,7 +286,7 @@ /* #undef LWS_LIBRARY_VERSION_NUMBER */ /* #undef LWS_AVOID_SIGPIPE_IGN */ -/* #UNdef LWS_BUILD_HASH */ +/* #undef LWS_BUILD_HASH */ /* #undef LWS_BUILTIN_GETIFADDRS */ #define LWS_CLIENT_HTTP_PROXYING /* #undef LWS_FALLBACK_GETHOSTBYNAME */ @@ -310,11 +310,11 @@ #define LWS_HAVE_EXECVPE /* #if !define(WIN32) && !define(_WIN32) */ -/* #undef LWS_HAVE_LIBCAP */ -/* #undef LWS_HAVE_EVENTFD */ -/* #undef LWS_HAVE_SYS_CAPABILITY_H */ -/* #undef LWS_HAVE_MALLOC_USABLE_SIZE */ -/* #undef LWS_WITH_TLS */ +/* #define LWS_HAVE_LIBCAP */ +/* #define LWS_HAVE_EVENTFD */ +/* #define LWS_HAVE_SYS_CAPABILITY_H */ +/* #define LWS_HAVE_MALLOC_USABLE_SIZE */ +/* #define LWS_WITH_TLS */ /* #endif */ #define LWS_HAVE_HMAC_CTX_new @@ -330,7 +330,7 @@ /* #undef LWS_HAVE_MBEDTLS_NET_SOCKETS */ /* #undef LWS_HAVE_NEW_UV_VERSION_H */ #define LWS_HAVE_OPENSSL_ECDH_H -/* #undef LWS_HAVE_PIPE2 */ +/* #define LWS_HAVE_PIPE2 */ #define LWS_HAVE_PTHREAD_H #define LWS_HAVE_RSA_SET0_KEY #define LWS_HAVE_RSA_verify_pss_mgf1 @@ -396,7 +396,6 @@ #define LWS_WITH_HTTP2 #define LWS_WITH_HTTP_BASIC_AUTH /* #undef LWS_WITH_HTTP_BROTLI */ -/* #undef LWS_HTTP_HEADERS_ALL */ /* #undef LWS_WITH_HTTP_PROXY */ /* #undef LWS_WITH_HTTP_STREAM_COMPRESSION */ #define LWS_WITH_HTTP_UNCOMMON_HEADERS diff --git a/include/lws_config_private.h b/include/lws_config_private.h index a4336b985623b6a9b8bb5781302b31c5d919237a..1005421b18859e3a429edb22540449a5fdf2715a 100644 --- a/include/lws_config_private.h +++ b/include/lws_config_private.h @@ -200,8 +200,8 @@ /* Define to 1 if you have the header file. */ #define LWS_HAVE_STRING_H -/* Define to 1 if you have the header file. */ -/* #define LWS_HAVE_STRING_H */ +/* Define to 1 if you have the header file. */ +/* #define LWS_HAVE_SYS_PRCTL_H */ /* Define to 1 if you have the header file. */ #define LWS_HAVE_SYS_SOCKET_H @@ -262,4 +262,4 @@ /* Defined if you have the header file. */ #define LWS_HAVE_INTTYPES_H -#endif +#endif \ No newline at end of file