Skip to content

Fix OSS build failures #572

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

Closed
carlocab wants to merge 1 commit into from
Closed

Fix OSS build failures #572

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions proxygen/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ set(
# append proxygen::coro sources
set(
PROXYGEN_CORO_SOURCES
dns/CAresResolver.cpp
dns/CachingDNSResolver.cpp
dns/DNSModule.cpp
dns/DNSResolver.cpp
dns/Rfc6724.cpp
Expand Down Expand Up @@ -307,6 +309,7 @@ target_link_libraries(
Boost::iostreams
ZLIB::ZLIB
${HTTP3_DEPEND_LIBS}
cares
)

# Install the headers, excluding unit testing related headers
Expand Down
7 changes: 1 addition & 6 deletions proxygen/lib/dns/CAresResolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ using std::unique_ptr;
using std::vector;

/* Make sure C-Ares error codes that map to DNS RCODE values are unchanged */
#if !(ARES_SUCCESS == 0 && ARES_EREFUSED == 6)
#error "C-Ares status does not map to DNS RCODE values"
#endif
static_assert(ARES_SUCCESS == 0 && ARES_EREFUSED == 6, "C-Ares status does not map to DNS RCODE values");

/* Convert a C-Ares status value to an DNS RCODE; -1 for unknown */
#define ARES_TO_RCODE(x) (((x) <= ARES_EREFUSED) ? (x) : -1)
Expand Down Expand Up @@ -161,9 +159,6 @@ void CAresResolver::Query::succeed(std::vector<Answer> answers) {

TraceFieldType lookupType;
switch (answer.type) {
case Answer::AnswerType::AT_TXT:
lookupType = TraceFieldType::TXT;
break;
case Answer::AnswerType::AT_ADDRESS:
lookupType = TraceFieldType::IpAddr;
break;
Expand Down
Loading