Remove do-nothing header <isc/stat.h>

Use <sys/stat.h> instead

diff --git a/bin/named/server.c b/bin/named/server.c
index 9ed5091ad9d0b8cc4275549dfb13273c2c3beb35..43871fa775c5b04d4fb19ba35dbc0b028a3c8f2c 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -54,7 +54,6 @@
 #include <isc/result.h>
 #include <isc/signal.h>
 #include <isc/siphash.h>
-#include <isc/stat.h>
 #include <isc/stats.h>
 #include <isc/stdio.h>
 #include <isc/string.h>

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index c1af1232cbf6434273ef9cbe1b73f9b4acbd9fb3..55eac3a7c98ca1bda431ec4c9aa83210854cb10b 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -80,7 +80,6 @@ libisc_la_HEADERS =                   \
        include/isc/signal.h\
        include/isc/siphash.h           \
        include/isc/sockaddr.h          \
-       include/isc/stat.h              \
        include/isc/stats.h             \
        include/isc/stdio.h             \
        include/isc/stdtime.h           \

diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 2e5d4d2da5103100efec42de3f75ff81b382ab77..73aeaf8265d63c563393aa0b91661d3a046a17a8 100644 (file)
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -19,9 +19,10 @@
 #include <stdio.h>
 
 #include <isc/lang.h>
-#include <isc/stat.h>
 #include <isc/types.h>
 
+#include <sys/stat.h>
+
 ISC_LANG_BEGINDECLS
 
 isc_result_t

diff --git a/lib/isc/include/isc/stat.h b/lib/isc/include/isc/stat.h
deleted file mode 100644 (file)
index fad37c9..0000000
--- a/lib/isc/include/isc/stat.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#pragma once
-
-/*****
-***** Module Info
-*****/
-
-/*
- * Portable <sys/stat.h> support.
- *
- * This module is responsible for defining S_IS??? macros.
- *
- * MP:
- *     No impact.
- *
- * Reliability:
- *     No anticipated impact.
- *
- * Resources:
- *     N/A.
- *
- * Security:
- *     No anticipated impact.
- *
- */
-
-/***
- *** Imports.
- ***/
-
-#include <sys/stat.h>
-#include <sys/types.h>

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 0a671916da244d579057bfd312bb73d3a7099fb8..0b30d8e2a0c821ea9f466e970163b613cab49b1b 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -18,6 +18,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <sys/types.h> /* dev_t FreeBSD 2.1 */
 #include <time.h>
 
@@ -28,7 +29,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/rwlock.h>
-#include <isc/stat.h>
 #include <isc/stdio.h>
 #include <isc/string.h>
 #include <isc/thread.h>

diff --git a/lib/isc/stdio.c b/lib/isc/stdio.c
index 12ab678c1f509a2a043e04b022dae98d7445ec46..ad987c66d5fb07e424cc95660999403e60e9016b 100644 (file)
--- a/lib/isc/stdio.c
+++ b/lib/isc/stdio.c
@@ -12,9 +12,9 @@
  */
 
 #include <errno.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
-#include <isc/stat.h>
 #include <isc/stdio.h>
 #include <isc/util.h>