Skip to content

Commit

Permalink
Merge pull request CleverRaven#72768 from droe/droe/20240401-fix-buil…
Browse files Browse the repository at this point in the history
…d-macos

Fix zlib old-style-cast build breakage
  • Loading branch information
Maleclypse authored Apr 5, 2024
2 parents 88620b6 + 389a351 commit d64e52d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/cata_utility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,10 @@ std::string read_compressed_file_to_string( std::istream &fin )
z_stream zs;
memset( &zs, 0, sizeof( zs ) );

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
if( inflateInit2( &zs, MAX_WBITS | 16 ) != Z_OK ) {
#pragma GCC diagnostic pop
throw std::runtime_error( "inflateInit failed while decompressing." );
}

Expand Down

0 comments on commit d64e52d

Please sign in to comment.