Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mac and compatibility fixes #12

Closed
wants to merge 2 commits into from
Closed

Mac and compatibility fixes #12

wants to merge 2 commits into from

Conversation

neurolabusc
Copy link

Minor modifications for #6

@@ -50,6 +50,9 @@
/* @(#) $Id$ */

#include "deflate.h"
#ifndef UINT32_MAX

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the change for zconf.* sufficient?

@@ -53,6 +55,17 @@ name:
#define ENDPROC(name) \
.size name, .-name

#else // __APPLE__

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merged it from the original PR

GIT_BEGIN_DECL
# include "inttypes.h"
GIT_END_DECL
/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment format (this and the rest) is /* text */ specifically space before and after, don't start with a capital

/* ensure flags is 64 bit regardless whether uLong is 32 or 64 bit
*/
uint64_t flags64 = zlibCompileFlags();
printf("zlib version %s = 0x%" PRIx64 ", compile flags = 0x%llx\n",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent. Need yo replace all %ll with PRI. I also assumed that %04x was OK?

ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
/* ensure flags is 64 bit regardless whether uLong is 32 or 64 bit
*/
uint64_t flags64 = zlibCompileFlags();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

@neurolabusc
Copy link
Author

Not required with recent patches.

fhanau pushed a commit to fhanau/zlib that referenced this pull request Feb 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants