Always include <errno.h> instead of <sys/errno.h>

Including <sys/errno.h> instead of <errno.h> raises a compiler warning
when building against musl libc.  Always include <errno.h> instead of
<sys/errno.h> to prevent that compilation warning from being triggered
and to achieve consistency in this regard across the entire source tree.

(cherry picked from commit b5cd146033a5a269cae5784ef64d7045fa9f487c)

diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index 92f3f8b77b4d7ae893f81794173d1d21ec386726..4450df2a0e19dedeaa059964e178c25aacb5dcf9 100644 (file)
--- a/bin/named/fuzz.c
+++ b/bin/named/fuzz.c
@@ -19,7 +19,7 @@
 #ifdef ENABLE_AFL
 #include <named/globals.h>
 #include <named/server.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <isc/app.h>
 #include <isc/condition.h>

diff --git a/contrib/dlz/modules/common/dlz_dbi.c b/contrib/dlz/modules/common/dlz_dbi.c
index 9e7a1c0db3b0c590e0668f2a9c28a41b84e691d9..0773915b0b6275b153eb5611303cb55b2829b1cf 100644 (file)
--- a/contrib/dlz/modules/common/dlz_dbi.c
+++ b/contrib/dlz/modules/common/dlz_dbi.c
@@ -41,14 +41,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <sys/errno.h>
-
 #include <dlz_minimal.h>
 #include <dlz_list.h>
 #include <dlz_dbi.h>

diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c
index 839a069a7f305d47099c48d0f9f439f442e4b776..af403b81453249cf0f4787b42af377bc76b13155 100644 (file)
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -18,11 +18,10 @@
 #include <setjmp.h>
 
 #include <sched.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/errno.h>
-
 #define UNIT_TESTING
 #include <cmocka.h>