Skip to content

Commit b7aa2cb

Browse files
committed
Correction for build with minizip-ng-3.0.10
Signed-off-by: Peter Kovář <[email protected]>
1 parent dc13f29 commit b7aa2cb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/OpenColorIO/OCIOZArchive.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
226226
std::string configStr = ss.str();
227227

228228
// Write zip to memory stream.
229-
#if MZ_VERSION_BUILD >= 040000
229+
#if MZ_VERSION_BUILD >= 0x040000
230230
write_mem_stream = mz_stream_mem_create();
231231
#else
232232
mz_stream_mem_create(&write_mem_stream);
@@ -242,7 +242,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
242242
options.compress_level = ArchiveCompressionLevels::BEST;
243243

244244
// Create the writer handle.
245-
#if MZ_VERSION_BUILD >= 040000
245+
#if MZ_VERSION_BUILD >= 0x040000
246246
archiver = mz_zip_writer_create();
247247
#else
248248
mz_zip_writer_create(&archiver);
@@ -341,7 +341,7 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
341341
std::string outputDestination = pystring::os::path::normpath(destination);
342342

343343
// Create zip reader.
344-
#if MZ_VERSION_BUILD >= 040000
344+
#if MZ_VERSION_BUILD >= 0x040000
345345
extracter = mz_zip_reader_create();
346346
#else
347347
mz_zip_reader_create(&extracter);
@@ -463,7 +463,7 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
463463
std::vector<uint8_t> buffer;
464464

465465
// Create the reader object.
466-
#if MZ_VERSION_BUILD >= 040000
466+
#if MZ_VERSION_BUILD >= 0x040000
467467
reader = mz_zip_reader_create();
468468
#else
469469
mz_zip_reader_create(&reader);
@@ -527,7 +527,7 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
527527
void *reader = NULL;
528528

529529
// Create the reader object.
530-
#if MZ_VERSION_BUILD >= 040000
530+
#if MZ_VERSION_BUILD >= 0x040000
531531
reader = mz_zip_reader_create();
532532
#else
533533
mz_zip_reader_create(&reader);

src/apps/ocioarchive/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ int main(int argc, const char **argv)
235235
}
236236

237237
std::string path = args[0];
238-
#if MZ_VERSION_BUILD >= 040000
238+
#if MZ_VERSION_BUILD >= 0x040000
239239
reader = mz_zip_reader_create();
240240
#else
241241
mz_zip_reader_create(&reader);

0 commit comments

Comments
 (0)