From 662fa5a7ec0da66c8ccb9167a1b5898493fce38d Mon Sep 17 00:00:00 2001 From: libenyao Date: Tue, 17 Jan 2023 07:25:40 +0000 Subject: [PATCH 1/4] =?UTF-8?q?update=20BUILD.gn.=20master=E5=88=86?= =?UTF-8?q?=E6=94=AF=E6=B7=BB=E5=8A=A0previewer=E4=BB=93gn=E9=80=82?= =?UTF-8?q?=E9=85=8D=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: libenyao --- BUILD.gn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ed913131..7a3bda8d 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", @@ -327,9 +327,9 @@ ohos_static_library("websocket_static") { "//third_party/libwebsockets/lib/roles/h2/http2.c", "//third_party/libwebsockets/lib/roles/h2/ops-h2.c", "//third_party/libwebsockets/lib/roles/http/client/client-http.c", - "//third_party/libwebsockets/lib/roles/http/date.c", "//third_party/libwebsockets/lib/roles/http/header.c", "//third_party/libwebsockets/lib/roles/http/parsers.c", + "//third_party/libwebsockets/lib/roles/http/date.c", "//third_party/libwebsockets/lib/roles/http/server/server.c", "//third_party/libwebsockets/lib/roles/listen/ops-listen.c", "//third_party/libwebsockets/lib/roles/pipe/ops-pipe.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") { -- Gitee From 1dd56d9178b947446a7a62cfe1a7cc84bb0693e7 Mon Sep 17 00:00:00 2001 From: libenyao Date: Tue, 17 Jan 2023 07:30:27 +0000 Subject: [PATCH 2/4] =?UTF-8?q?update=20include/lws=5Fconfig.h.=20master?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B7=BB=E5=8A=A0previewer=E4=BB=93gn?= =?UTF-8?q?=E9=80=82=E9=85=8D=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: libenyao --- include/lws_config.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/include/lws_config.h b/include/lws_config.h index bd5ad7b6..18254f2b 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 -- Gitee From 27fad3558dd01176b31dbf7bd34b1354290a8b04 Mon Sep 17 00:00:00 2001 From: libenyao Date: Tue, 17 Jan 2023 07:36:59 +0000 Subject: [PATCH 3/4] =?UTF-8?q?update=20include/lws=5Fconfig=5Fprivate.h.?= =?UTF-8?q?=20master=E5=88=86=E6=94=AF=E6=B7=BB=E5=8A=A0previewer=E4=BB=93?= =?UTF-8?q?gn=E9=80=82=E9=85=8D=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: libenyao --- include/lws_config_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/lws_config_private.h b/include/lws_config_private.h index a4336b98..1005421b 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 -- Gitee From 7ed349637121125c3b2a7af3243895be7b7f7df0 Mon Sep 17 00:00:00 2001 From: libenyao Date: Tue, 17 Jan 2023 08:58:08 +0000 Subject: [PATCH 4/4] update BUILD.gn. format Signed-off-by: libenyao --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 7a3bda8d..f94449a7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -327,9 +327,9 @@ ohos_static_library("websockets_static") { "//third_party/libwebsockets/lib/roles/h2/http2.c", "//third_party/libwebsockets/lib/roles/h2/ops-h2.c", "//third_party/libwebsockets/lib/roles/http/client/client-http.c", + "//third_party/libwebsockets/lib/roles/http/date.c", "//third_party/libwebsockets/lib/roles/http/header.c", "//third_party/libwebsockets/lib/roles/http/parsers.c", - "//third_party/libwebsockets/lib/roles/http/date.c", "//third_party/libwebsockets/lib/roles/http/server/server.c", "//third_party/libwebsockets/lib/roles/listen/ops-listen.c", "//third_party/libwebsockets/lib/roles/pipe/ops-pipe.c", -- Gitee