Skip to content

Mac and compatibility fixes#12

Closed
neurolabusc wants to merge 2 commits intocloudflare:gcc.amd64from
neurolabusc:gcc.amd64
Closed

Mac and compatibility fixes#12
neurolabusc wants to merge 2 commits intocloudflare:gcc.amd64from
neurolabusc:gcc.amd64

Conversation

@neurolabusc
Copy link
Copy Markdown

Minor modifications for #6

/* @(#) $Id$ */

#include "deflate.h"
#ifndef UINT32_MAX
Copy link
Copy Markdown

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?

#define ENDPROC(name) \
.size name, .-name

#else // __APPLE__
Copy link
Copy Markdown

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.*/
Copy link
Copy Markdown

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",
Copy link
Copy Markdown

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();
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why?

@neurolabusc
Copy link
Copy Markdown
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