From ea51283f7bae5b8c97f002477f84ab8d2492900b Mon Sep 17 00:00:00 2001 From: PatriceJiang <397136899@qq.com> Date: Tue, 2 Mar 2021 14:51:53 +0800 Subject: [PATCH] update libwebsockets --- ohos/arm64-v8a/include/libwebsockets.h | 2 +- ohos/arm64-v8a/include/lws_config.h | 4 ++-- ohos/arm64-v8a/lib/libwebsockets.a | Bin 357838 -> 357366 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ohos/arm64-v8a/include/libwebsockets.h b/ohos/arm64-v8a/include/libwebsockets.h index 460c7326..46b495e9 100644 --- a/ohos/arm64-v8a/include/libwebsockets.h +++ b/ohos/arm64-v8a/include/libwebsockets.h @@ -159,7 +159,7 @@ typedef unsigned long long lws_intptr_t; #define LWS_FORMAT(string_index) #endif -#if defined(__ANDROID__) +#if defined(__OHOS__) #include #define getdtablesize() sysconf(_SC_OPEN_MAX) #endif diff --git a/ohos/arm64-v8a/include/lws_config.h b/ohos/arm64-v8a/include/lws_config.h index 32b947ff..126e2611 100644 --- a/ohos/arm64-v8a/include/lws_config.h +++ b/ohos/arm64-v8a/include/lws_config.h @@ -6,7 +6,7 @@ #endif #endif -#define LWS_INSTALL_DATADIR "/Volumes/data/hw/arm64/share" +#define LWS_INSTALL_DATADIR "/Users/pt/Github/cocos2d-x-lite-external/ohos/arm64-v8a/share" /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ @@ -100,7 +100,7 @@ /* #undef LWS_WITH_CGI */ /* whether the Openssl is recent enough, and / or built with, ecdh */ -#define LWS_HAVE_OPENSSL_ECDH_H +/* #undef LWS_HAVE_OPENSSL_ECDH_H */ /* HTTP Proxy support */ /* #undef LWS_WITH_HTTP_PROXY */ diff --git a/ohos/arm64-v8a/lib/libwebsockets.a b/ohos/arm64-v8a/lib/libwebsockets.a index f3a98b57d7a19542a7367202f9b10bcfef0ff268..a7f2cb1ae017a2219422e64b5130579f36cee4c6 100644 GIT binary patch delta 7787 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 Kq3J7)2L7KY?k~{* delta 7917 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