Move to another patch file

awslabs · Oct 24, 2023 · d94a3da · d94a3da
1 parent a6c7de2
commit d94a3da
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/CMake/Dependencies/libwebsockets-CMakeLists.txt b/CMake/Dependencies/libwebsockets-CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.6.3)
 
 project(libwebsocket-download NONE)
 
-SET(PATCH_COMMAND git apply --verbose --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch)
+SET(PATCH_COMMAND git apply --verbose --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-old-gcc-fix-cast-cmakelists.patch ${CMAKE_CURRENT_LIST_DIR}/libwebsockets-lwsmap-fix.patch)
 
 include(ExternalProject)
 if (BUILD_STATIC_LIBS)

diff --git a/CMake/Dependencies/libwebsockets-lwsmap-fix.patch b/CMake/Dependencies/libwebsockets-lwsmap-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/lib/core/lws_map.c b/lib/core/lws_map.c
+index d149d86752..b319d79f49 100644
+--- a/lib/core/lws_map.c
++++ b/lib/core/lws_map.c
+@@ -29,11 +29,11 @@ typedef struct lws_map_hashtable {
+ 	lws_dll2_owner_t		ho;
+ } lws_map_hashtable_t;
+
+-typedef struct lws_map {
++struct lws_map {
+ 	lws_map_info_t			info;
+
+ 	/* array of info.modulo x lws_map_hashtable_t overallocated */
+-} lws_map_t;
++};
+
+ typedef struct lws_map_item {
+ 	lws_dll2_t			list; /* owned by hashtable */
diff --git a/CMake/Dependencies/libwebsockets-old-gcc-fix-cast-cmakelists.patch b/CMake/Dependencies/libwebsockets-old-gcc-fix-cast-cmakelists.patch
@@ -3,7 +3,7 @@ index 68629e6f..6ef628b8 100644
 --- a/lib/roles/h2/hpack.c
 +++ b/lib/roles/h2/hpack.c
 @@ -1110,7 +1110,7 @@ pre_data:
- 
+
  		for (n = 0; n < 8; n++) {
  			if (h2n->huff) {
 -				char b = (c >> 7) & 1;
@@ -17,7 +17,7 @@ index b214df75..06eaf255 100644
 +++ b/lib/tls/CMakeLists.txt
 @@ -57,10 +57,10 @@ if (LWS_WITH_BORINGSSL)
  endif()
- 
+
  if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL AND NOT LWS_WITH_MBEDTLS)
 -	if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
 +	if (("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" AND ("${LWS_OPENSSL_SSL_LIBRARY}" STREQUAL "" OR "${LWS_OPENSSL_CRYPTO_LIBRARY}" STREQUAL "")) OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
@@ -38,22 +38,4 @@ index b214df75..06eaf255 100644
 +				endif()
  				set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE)
  			endif()
- 			set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
-diff --git a/lib/core/lws_map.c b/lib/core/lws_map.c
-index d149d8675..b319d79f4 100644
---- a/lib/core/lws_map.c
-+++ b/lib/core/lws_map.c
-@@ -29,11 +29,11 @@ typedef struct lws_map_hashtable {
- 	lws_dll2_owner_t		ho;
- } lws_map_hashtable_t;
-
--typedef struct lws_map {
-+struct lws_map {
- 	lws_map_info_t			info;
-
- 	/* array of info.modulo x lws_map_hashtable_t overallocated */
--} lws_map_t;
-+};
-
- typedef struct lws_map_item {
- 	lws_dll2_t			list; /* owned by hashtable */
+ 			set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")