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.

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

[BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown #2102

Merged
merged 2 commits into from
Apr 19, 2023
Merged

[BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df4f40
Fix #2101
marcalff Apr 19, 2023
4662e0a
Add CHANGELOG
marcalff Apr 19, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Increment the:

## [Unreleased]

* [BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown
[#2102](https://github.com/open-telemetry/opentelemetry-cpp/pull/2102)

Deprecations:

* The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
Expand Down
5 changes: 5 additions & 0 deletions ext/src/http/client/curl/http_operation_curl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
#include "opentelemetry/sdk/common/global_log_handler.h"

// CURL_VERSION_BITS was added in CURL 7.43.0
marcalff marked this conversation as resolved.
Show resolved Hide resolved
#ifndef CURL_VERSION_BITS
# define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | (z))
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
namespace ext
{
Expand Down