From 3f341b996d31fafe76bba18fbb72bd1d55f31920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Tue, 30 Jul 2019 21:08:40 +0200
Subject: [PATCH] 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)
---
 bin/named/fuzz.c                     | 2 +-
 contrib/dlz/modules/common/dlz_dbi.c | 3 +--
 lib/isc/tests/errno_test.c           | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index 5907877c2d..47b15f5d5c 100644
--- 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 566e10b2ba..7b4c9da5f0 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 c4f8beb48f..39a1f01ec0 100644
--- a/lib/isc/tests/errno_test.c
+++ b/lib/isc/tests/errno_test.c
@@ -17,11 +17,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>