Fix compilation of ModelicaMatIO.c if HAVE_ZLIB=0 is defined #3085
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
beutlich
added
bug
sjoelund
requested changes
Aug 10, 2019
There was a problem hiding this comment.
This is the wrong fix. If you have HAVE_ZLIB=0, I guess the intention is to not compile with zlib, but you do compile with zlib if it is 0. A better fix would be to use if HAVE_ZLIB everywhere, or at the top (before including zlib.h):
#if defined(HAVE_ZLIB) && !HAVE_ZLIB
#undef HAVE_ZLIB
#endif
The autotools job either sets HAVE_ZLIB=1 or does not set it at all so it will not have a problem compiling the existing sources.
|
And similar for HAVE_HDF5, right? |
sjoelund
approved these changes
Aug 10, 2019
HansOlsson
approved these changes
Aug 22, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
HAVE_ZLIB=0is defined, no zlib will be used.