From: Michał Kępień <michal@isc.org>
Date: Tue, 30 Jul 2019 19:08:40 +0000 (+0200)
Subject: Always include <errno.h> instead of <sys/errno.h>
X-Git-Tag: v9.15.3~26^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5cd146033a5a269cae5784ef64d7045fa9f487c;p=thirdparty%2Fbind9.git

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.
---

diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index b82ac372121..02c75d303aa 100644
--- a/bin/named/fuzz.c
+++ b/bin/named/fuzz.c
@@ -17,7 +17,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 566e10b2ba4..7b4c9da5f0b 100644
--- a/contrib/dlz/modules/common/dlz_dbi.c
+++ b/contrib/dlz/modules/common/dlz_dbi.c
@@ -41,6 +41,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -48,8 +49,6 @@
 #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 5d62a954d99..5b111499d83 100644
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -15,11 +15,10 @@
 #include <stddef.h>
 #include <setjmp.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/errno.h>
-
 #define UNIT_TESTING
 #include <cmocka.h>