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 <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · May 30, 2021 · ab58700 · ab58700
1 parent 621df69
commit ab58700
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -38,6 +38,19 @@
 #include <vector>
 #include <unordered_set>
 
+#ifndef T_CAA
+# define T_CAA    257 /* Certification Authority Authorization */
+#endif
+
+// OpenBSD does not define these
+#ifndef AI_ALL
+# define AI_ALL 0
+#endif
+#ifndef AI_V4MAPPED
+# define AI_V4MAPPED 0
+#endif
+
+
 namespace node {
 namespace cares_wrap {
 

diff --git a/src/cares_wrap.h b/src/cares_wrap.h
@@ -32,14 +32,6 @@
 # include <arpa/nameser.h>
 #endif
 
-#ifndef T_CAA
-#  define T_CAA    257 /* Certification Authority Authorization */
-#endif
-
-#if defined(__OpenBSD__)
-# define AI_V4MAPPED 0
-#endif
-
 namespace node {
 namespace cares_wrap {