Commit 524a9d6
src: update cares_wrap OpenBSD defines
Move the `#define`s back into `cares_wrap.cc`, as they are part of
the implementation, not the declarations used in `cares_wrap.h`,
and apply the suggestion from
#38572 (comment)
to make the defines a bit more generic and not check for OpenBSD
specifically.
Refs: #38572
PR-URL: #38670
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent fbf02e3 commit 524a9d6
2 files changed
Lines changed: 13 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,6 +38,19 @@ | |||
| 38 | 38 | #include <vector> | |
| 39 | 39 | #include <unordered_set> | |
| 40 | 40 | ||
| 41 | + #ifndef T_CAA | ||
| 42 | + # define T_CAA 257 /* Certification Authority Authorization */ | ||
| 43 | + #endif | ||
| 44 | + | ||
| 45 | + // OpenBSD does not define these | ||
| 46 | + #ifndef AI_ALL | ||
| 47 | + # define AI_ALL 0 | ||
| 48 | + #endif | ||
| 49 | + #ifndef AI_V4MAPPED | ||
| 50 | + # define AI_V4MAPPED 0 | ||
| 51 | + #endif | ||
| 52 | + | ||
| 53 | + | ||
| 41 | 54 | namespace node { | |
| 42 | 55 | namespace cares_wrap { | |
| 43 | 56 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,14 +32,6 @@ | |||
| 32 | 32 | # include <arpa/nameser.h> | |
| 33 | 33 | #endif | |
| 34 | 34 | ||
| 35 | - #ifndef T_CAA | ||
| 36 | - # define T_CAA 257 /* Certification Authority Authorization */ | ||
| 37 | - #endif | ||
| 38 | - | ||
| 39 | - #if defined(__OpenBSD__) | ||
| 40 | - # define AI_V4MAPPED 0 | ||
| 41 | - #endif | ||
| 42 | - | ||
| 43 | 35 | namespace node { | |
| 44 | 36 | namespace cares_wrap { | |
| 45 | 37 | ||
0 commit comments