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

Add zng_ prefix to internal functions to avoid linking conflicts with zlib. #363

Merged
merged 3 commits into from
Jul 18, 2019

Conversation

nmoinvaz
Copy link
Member

This pull requests adds zng_ prefix to certain internal functions to allow for dual linking both zlib & zlib-ng. #358, #360

@nmoinvaz nmoinvaz changed the title Added zng_ prefix to functions for dual zlib/zlib-ng linking. #358 Added zng_ prefix to functions for dual zlib/zlib-ng linking. Jun 21, 2019
@nmoinvaz nmoinvaz changed the title Added zng_ prefix to functions for dual zlib/zlib-ng linking. Added zng_ prefix to internal functions for dual zlib/zlib-ng linking. Jun 21, 2019
deflate_medium.c Outdated Show resolved Hide resolved
@nmoinvaz
Copy link
Member Author

I have made the PR so it is only renaming of functions like you suggested.

@nmoinvaz nmoinvaz mentioned this pull request Jun 22, 2019
@nmoinvaz
Copy link
Member Author

Looks like Travis CI stalled on one instance.

@Dead2 Dead2 changed the title Added zng_ prefix to internal functions for dual zlib/zlib-ng linking. Add zng_ prefix to internal functions to avoid linking conflicts with zlib. Jul 18, 2019
@Dead2
Copy link
Member

Dead2 commented Jul 18, 2019

Looks good to me, and it passes my tests.

@Dead2
Copy link
Member

Dead2 commented Jul 18, 2019

Thanks

@Dead2 Dead2 merged commit f06c71f into zlib-ng:develop Jul 18, 2019
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