fix zip file warnings

git-svn-id: svn://svn.icculus.org/netradiant/trunk@393 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-07-26 15:51:46 +00:00
parent d9e57a87b9
commit bc68966c60

View File

@ -72,7 +72,7 @@ inline void istream_read_zip_dostime(InputStream& istream, zip_dostime& dostime)
dostime.date = istream_read_int16_le(istream); dostime.date = istream_read_int16_le(istream);
} }
const zip_magic zip_file_header_magic = { 'P', 'K', 0x03, 0x04, }; const zip_magic zip_file_header_magic = { { 'P', 'K', 0x03, 0x04 } };
/* A. Local file header */ /* A. Local file header */
struct zip_file_header struct zip_file_header
@ -111,7 +111,7 @@ inline void istream_read_zip_file_header(SeekableInputStream& istream, zip_file_
* and immediately follows the last byte of compressed data. It is only used if * and immediately follows the last byte of compressed data. It is only used if
* the output media of the compressor was not seekable, eg. standard output. * the output media of the compressor was not seekable, eg. standard output.
*/ */
const zip_magic zip_file_trailer_magic = { 'P', 'K', 0x07, 0x08, }; const zip_magic zip_file_trailer_magic = { { 'P', 'K', 0x07, 0x08} };
struct zip_file_trailer struct zip_file_trailer
{ {
@ -138,7 +138,7 @@ inline void istream_read_zip_file_trailer(InputStream& istream, zip_file_trailer
* - a single entry including filename, extras and comment may not exceed 64k. * - a single entry including filename, extras and comment may not exceed 64k.
*/ */
const zip_magic zip_root_dirent_magic = { 'P', 'K', 0x01, 0x02, }; const zip_magic zip_root_dirent_magic = { { 'P', 'K', 0x01, 0x02 } };
struct zip_root_dirent struct zip_root_dirent
{ {
@ -185,7 +185,7 @@ inline void istream_read_zip_root_dirent(SeekableInputStream& istream, zip_root_
} }
/* end of central dir record */ /* end of central dir record */
const zip_magic zip_disk_trailer_magic = { 'P', 'K', 0x05, 0x06, }; const zip_magic zip_disk_trailer_magic = { { 'P', 'K', 0x05, 0x06 } };
const unsigned int disk_trailer_length = 22; const unsigned int disk_trailer_length = 22;
struct zip_disk_trailer struct zip_disk_trailer
{ {