From 3bb0f06ec91c096ecb322fa3f37271c6c8b38dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 14 Nov 2017 19:44:22 +0100 Subject: [PATCH] 2017-11-14 19:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbmzip/mzip.c * use 'char *' instead of 'zipcharpc' to compile with minizip versions which do not define 'zipcharpc' type --- ChangeLog.txt | 5 +++++ contrib/hbmzip/mzip.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f4f7a15ba6..4032adb913 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2017-11-14 19:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbmzip/mzip.c + * use 'char *' instead of 'zipcharpc' to compile with minizip versions + which do not define 'zipcharpc' type + 2017-10-18 10:07 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbwin/hbwin.ch * contrib/hbwin/hbwin.hbx diff --git a/contrib/hbmzip/mzip.c b/contrib/hbmzip/mzip.c index a89a4d57fd..5f7f000d17 100644 --- a/contrib/hbmzip/mzip.c +++ b/contrib/hbmzip/mzip.c @@ -237,10 +237,10 @@ HB_FUNC( HB_ZIPOPEN ) if( szFileName ) { - zipcharpc pszGlobalComment = NULL; - char * pszFree; - zipFile hZip = zipOpen2( hb_fsNameConv( szFileName, &pszFree ), hb_parnidef( 2, APPEND_STATUS_CREATE ), - &pszGlobalComment, NULL ); + const char * pszGlobalComment = NULL; + char * pszFree; + zipFile hZip = zipOpen2( hb_fsNameConv( szFileName, &pszFree ), hb_parnidef( 2, APPEND_STATUS_CREATE ), + &pszGlobalComment, NULL ); if( pszFree ) hb_xfree( pszFree ); @@ -253,7 +253,7 @@ HB_FUNC( HB_ZIPOPEN ) hb_retptrGC( phZip ); if( pszGlobalComment ) - hb_storc( ( const char * ) pszGlobalComment, 3 ); + hb_storc( pszGlobalComment, 3 ); } } else