diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-04-19 12:03:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-04-19 12:03:08 +0000 |
| commit | 7defc692499acbad86cecec7b53da0ca0b43f128 (patch) | |
| tree | 297d005fe60c942687da67f17f6ce6567b9e8f4a /ACE | |
| parent | 7b2c6d8e1a0b696523a63592629417b593c12c17 (diff) | |
| download | ATCD-7defc692499acbad86cecec7b53da0ca0b43f128.tar.gz | |
Fri Apr 19 12:02:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* contrib/minizip/unzip.c:
* contrib/minizip/zip.c:
Fixed warnings
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/contrib/minizip/unzip.c | 2 | ||||
| -rw-r--r-- | ACE/contrib/minizip/zip.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index edb3fdde15f..cf22964ad87 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 19 12:02:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * contrib/minizip/unzip.c: + * contrib/minizip/zip.c: + Fixed warnings + Fri Apr 19 11:15:43 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c index 14f5621f824..85fd149f9b3 100644 --- a/ACE/contrib/minizip/unzip.c +++ b/ACE/contrib/minizip/unzip.c @@ -1126,7 +1126,7 @@ extern MINIZIP_EXPORT int unzOpenCurrentFile3 (unzFile file,int* method,int* lev if (password != 0) { int i; - s->pcrc_32_tab = get_crc_table(); + s->pcrc_32_tab = (unsigned long*)get_crc_table(); init_keys(password,s->keys,s->pcrc_32_tab); if (ZSEEK(s->z_filefunc, s->filestream, s->pfile_in_zip_read->pos_in_zipfile + diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c index a57fcfc61ef..3572e523b13 100644 --- a/ACE/contrib/minizip/zip.c +++ b/ACE/contrib/minizip/zip.c @@ -846,7 +846,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip3 (zipFile file,const char* filenam unsigned char bufHead[RAND_HEAD_LEN]; unsigned int sizeHead; zi->ci.encrypt = 1; - zi->ci.pcrc_32_tab = get_crc_table(); + zi->ci.pcrc_32_tab = (unsigned long*)get_crc_table(); /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/ sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting); |