c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation when iconv is not supported on platform. #463

Browse Source
This commit is contained in:
Nathan Moinvaziri 2020-04-07 19:05:41 -07:00
parent 775565c657
commit e450c03de7
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -320,6 +320,7 @@ if(UNIX)
find_package(Iconv QUIET)
if (Iconv_FOUND)
message(STATUS "Using Iconv")
list(APPEND MINIZIP_DEF -DHAVE_ICONV)
list(APPEND MINIZIP_INC ${Iconv_INCLUDE_DIRS})
set(PC_PRIVATE_LIBS "${PC_PRIVATE_LIBS} -liconv")
endif()

18
mz_os_posix.c
View File

@ -15,7 +15,9 @@
#include <stdio.h> /* rename */
#include <errno.h>
#if defined(HAVE_ICONV)
#include <iconv.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
@ -31,6 +33,7 @@
/***************************************************************************/
#if defined(HAVE_ICONV)
uint8_t *mz_os_utf8_string_create(const char *string, int32_t encoding)
{
iconv_t cd;
@ -84,6 +87,21 @@ uint8_t *mz_os_utf8_string_create(const char *string, int32_t encoding)
return string_utf8;
}
#else
#pragma message("Warning: Limited encoding support")
uint8_t *mz_os_utf8_string_create(const char *string, int32_t encoding)
{
size_t string_length = 0;
uint8_t *string_copy = NULL;
string_length = strlen(string);
string_copy = (uint8_t *)MZ_ALLOC((int32_t)(string_length + 1));
strncpy(string_copy, string, string_length);
string_copy[string_length] = 0;
return string_copy;
}
#endif
void mz_os_utf8_string_delete(uint8_t **string)
{