Reintro gcc patch for lws_map

Author: disa6302

CMake/Dependencies/libwebsockets-CMakeLists.txt

@@ -2,6 +2,8 @@ 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)
+
 include(ExternalProject)
 if (BUILD_STATIC_LIBS)
   set(LWS_WITH_SHARED 0)

CMake/Dependencies/libwebsockets-old-gcc-fix-cast-cmakelists.patch

@@ -11,34 +11,6 @@ index 68629e6f..6ef628b8 100644
  				prev = h2n->hpack_pos;
  				h2n->hpack_pos = (uint16_t)huftable_decode(
  						(int)h2n->hpack_pos, b);
-diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt
-index b214df75..06eaf255 100644
---- a/lib/tls/CMakeLists.txt
-+++ 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 "")
- 	else()
- 		if (NOT LWS_PLAT_FREERTOS)
--			set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
-+			list(APPEND OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES} ${LWS_OPENSSL_SSL_LIBRARY} ${LWS_OPENSSL_CRYPTO_LIBRARY})
- 		endif()
- 		set(OPENSSL_INCLUDE_DIRS ${LWS_OPENSSL_INCLUDE_DIRS})
- 		set(OPENSSL_FOUND 1)
-@@ -248,7 +248,9 @@ if (LWS_WITH_SSL)
- 				find_package(PkgConfig QUIET)
- 				pkg_check_modules(PC_OPENSSL openssl QUIET)
- 				find_package(OpenSSL REQUIRED)
--				list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
-+				if (NOT LWS_WITH_STATIC)
-+					list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
-+				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 d149d86752..b319d79f49 100644
 --- a/lib/core/lws_map.c