Skip to content

Undefine compress if it is defined by zconf.h #1150

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 10, 2019
Merged

Undefine compress if it is defined by zconf.h #1150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Release/src/http/common/http_compression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@

#if defined(CPPREST_HTTP_COMPRESSION)
#include <zlib.h>
// zconf.h may define compress
#ifdef compress
#undef compress
#endif
#if !defined(CPPREST_EXCLUDE_BROTLI)
#define CPPREST_BROTLI_COMPRESSION
#endif // CPPREST_EXCLUDE_BROTLI
Expand Down