diff options
author | 2009-02-28 22:10:06 +0000 | |
---|---|---|
committer | 2009-02-28 22:10:06 +0000 | |
commit | e2757c60d2fa5e74909eff1e7a48ce5841ad47e5 (patch) | |
tree | b30bddf750ef14f54e147b8d214d693af27f5d33 /src/lib/util/unzip.c | |
parent | 42004cf3baf9c0307775c43096df36c1d5884bf4 (diff) |
Modified the makefile to support experimental optional C++
compilation:
- new option CPP_COMPILE to trigger this (off by default)
- split CFLAGS into common, C-only, and C++-only flags
- when enabled, CPP_COMPILE causes 'pp' to be appended to
the target name
NOTE THAT THE SYSTEM CANNOT ACTUALLY BE COMPILED THIS WAY
YET. IT IS JUST AN EXPERIMENT.
Modified lib.mak to always build zlib/expat as C regardless
of CPP_COMPILE.
Modified windows.mak to fix warnings with MAXOPT=1, and to
leverage the new CFLAGs definitions.
Modified vconv.c to do appropriate conversions for new C++
options.
Updated sources so that libutil, libocore (Windows), and
libosd (Windows) can be cleanly compiled as C or C++. This
was mostly adding some casts against void *.
Fixed a few more general obvious problems at random
locations in the source:
- device->class is now device->devclass
- TYPES_COMPATIBLE uses typeid() when compiled for C++
- some functions with reserved names ('xor' in particular)
were renamed
- nested enums and structs were pulled out into separate
definitions (under C++ these would need to be scoped to
be referenced)
- TOKEN_VALUE cannot use .field=x initialization in C++ :(
Diffstat (limited to 'src/lib/util/unzip.c')
-rw-r--r-- | src/lib/util/unzip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/util/unzip.c b/src/lib/util/unzip.c index 5e9ec06c325..e49fc4c4057 100644 --- a/src/lib/util/unzip.c +++ b/src/lib/util/unzip.c @@ -149,7 +149,7 @@ zip_error zip_file_open(const char *filename, zip_file **zip) } /* allocate memory for the zip_file structure */ - newzip = malloc(sizeof(*newzip)); + newzip = (zip_file *)malloc(sizeof(*newzip)); if (newzip == NULL) return ZIPERR_OUT_OF_MEMORY; memset(newzip, 0, sizeof(*newzip)); @@ -175,7 +175,7 @@ zip_error zip_file_open(const char *filename, zip_file **zip) } /* allocate memory for the central directory */ - newzip->cd = malloc(newzip->ecd.cd_size + 1); + newzip->cd = (UINT8 *)malloc(newzip->ecd.cd_size + 1); if (newzip->cd == NULL) { ziperr = ZIPERR_OUT_OF_MEMORY; @@ -191,7 +191,7 @@ zip_error zip_file_open(const char *filename, zip_file **zip) } /* make a copy of the filename for caching purposes */ - string = malloc(strlen(filename) + 1); + string = (char *)malloc(strlen(filename) + 1); if (string == NULL) { ziperr = ZIPERR_OUT_OF_MEMORY; @@ -427,7 +427,7 @@ static zip_error read_ecd(zip_file *zip) buflen = zip->length; /* allocate buffer */ - buffer = malloc(buflen + 1); + buffer = (UINT8 *)malloc(buflen + 1); if (buffer == NULL) return ZIPERR_OUT_OF_MEMORY; @@ -556,7 +556,7 @@ static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buff /* reset the stream */ memset(&stream, 0, sizeof(stream)); - stream.next_out = buffer; + stream.next_out = (Bytef *)buffer; stream.avail_out = length; /* initialize the decompressor */ |