Stop including sys/types.h

2025-03-28 21:33:13 +00:00 · 2022-09-02 05:03:03 +02:00 · 2022-09-02 05:03:03 +02:00 · 5bffa33a12
commit 5bffa33a12
parent 05fc6ee27c
14 changed files with 8 additions and 69 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -154,8 +154,8 @@ if (NOT MSVC)
 	endif()
 	check_include_files(arpa/inet.h HAVE_ARPA_INET_H)
 	check_include_files(arpa/nameser.h HAVE_ARPA_NAMESER_H)
-	check_struct_has_member("struct sockaddr_storage" ss_family "sys/socket.h;sys/types.h" HAVE_SS_FAMILY)
-	check_struct_has_member("struct sockaddr_storage" __ss_family "sys/socket.h;sys/types.h" HAVE_BROKEN_SS_FAMILY)
+	check_struct_has_member("struct sockaddr_storage" ss_family "sys/socket.h" HAVE_SS_FAMILY)
+	check_struct_has_member("struct sockaddr_storage" __ss_family "sys/socket.h" HAVE_BROKEN_SS_FAMILY)
 	if(HAVE_BROKEN_SS_FAMILY)
 		set(ss_family __ss_family)
 	endif()
@ -189,14 +189,12 @@ if (NOT MSVC)
 	check_include_files(sys/stat.h HAVE_SYS_STAT_H)
 	check_include_files(sys/timeb.h HAVE_SYS_TIMEB_H)
 	check_include_files(sys/time.h HAVE_SYS_TIME_H)
-	check_include_files(sys/types.h HAVE_SYS_TYPES_H)
 	check_include_files(unistd.h HAVE_UNISTD_H)
 	check_function_exists(va_copy HAVE_VA_COPY)
 	check_function_exists(__va_copy HAVE___VA_COPY)
 	set(LT_OBJDIR ".libs/")
 	check_c_source_compiles("
 		#include <sys/socket.h>
-		#include <sys/types.h>
 		int main() { (void) send(1, (const char*) \"\", 1, 1); return 0; }
 	" SEND_ARG2_CAST_CONST)
 	if(NOT SEND_ARG2_CAST_CONST)
@ -217,7 +215,6 @@ if (NOT MSVC)
 	check_c_source_compiles("
 		#include <stddef.h>
 		#include <sys/socket.h>
-		#include <sys/types.h>
 		int main() { (void) getsockopt(1, 1, 1, NULL, (socklen_t*) NULL); return 0; }
 	" XML_SOCKLEN_T_SOCKLEN_T)
 	if(XML_SOCKLEN_T_SOCKLEN_T)
@ -226,7 +223,6 @@ if (NOT MSVC)
 		check_c_source_compiles("
 			#include <stddef.h>
 			#include <sys/socket.h>
-			#include <sys/types.h>
 			int main() { (void) getsockopt(1, 1, 1, NULL, (size_t*) NULL); return 0; }
 		" XML_SOCKLEN_T_SIZE_T)
 		if(XML_SOCKLEN_T_SIZE_T)
@ -235,7 +231,6 @@ if (NOT MSVC)
 			check_c_source_compiles("
 				#include <stddef.h>
 				#include <sys/socket.h>
-				#include <sys/types.h>
 				int main() { (void) getsockopt (1, 1, 1, NULL, (int*) NULL); return 0; }
 			" XML_SOCKLEN_T_INT)
 			set(XML_SOCKLEN_T int)
--- a/catalog.c
+++ b/catalog.c
@ -18,9 +18,6 @@
 #ifdef LIBXML_CATALOG_ENABLED
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@ -108,9 +108,6 @@
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H 1

-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1

--- a/configure.ac
+++ b/configure.ac
@ -289,42 +289,19 @@ dnl
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([unistd.h])
 AC_CHECK_HEADERS([sys/stat.h])
-AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([stdint.h])
 AC_CHECK_HEADERS([inttypes.h])
-AC_CHECK_HEADERS([sys/socket.h], [], [],
-[#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-])
-AC_CHECK_HEADERS([netinet/in.h], [], [],
-[#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-])
-AC_CHECK_HEADERS([arpa/inet.h], [], [],
-[#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-# endif
-])
+AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([arpa/inet.h])
 AC_CHECK_HEADERS([netdb.h])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([poll.h])
 AC_CHECK_HEADERS([sys/mman.h])
 AC_CHECK_HEADERS([sys/timeb.h])
-AC_CHECK_HEADERS([arpa/nameser.h], [], [],
-[#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
-])
-AC_CHECK_HEADERS([resolv.h], [], [],
-[#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-# endif
+AC_CHECK_HEADERS([arpa/nameser.h])
+AC_CHECK_HEADERS([resolv.h], [], [], [
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 # endif
@ -398,21 +375,18 @@ dnl Determine what socket length (socklen_t) data type is
 AC_MSG_CHECKING([for type of socket length (socklen_t)])
 AC_TRY_COMPILE2([
 #include <stddef.h>
-#include <sys/types.h>
 #include <sys/socket.h>],[
 (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)],[
  AC_MSG_RESULT(socklen_t *)
  XML_SOCKLEN_T=socklen_t],[
  AC_TRY_COMPILE2([
 #include <stddef.h>
-#include <sys/types.h>
 #include <sys/socket.h>],[
 (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL)],[
    AC_MSG_RESULT(size_t *)
    XML_SOCKLEN_T=size_t],[
    AC_TRY_COMPILE2([
 #include <stddef.h>
-#include <sys/types.h>
 #include <sys/socket.h>],[
 (void)getsockopt (1, 1, 1, NULL, (int *)NULL)],[
      AC_MSG_RESULT(int *)
@ -438,8 +412,7 @@ fi

 dnl Checking if send() second argument is const.
 AC_MSG_CHECKING([for const send() second argument])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#include <sys/socket.h>]],
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]],
    [[(void)send(1,(const char *)"",1,1);]])],
 have_send_const_arg2=yes,
 have_send_const_arg2=no)
@ -464,7 +437,6 @@ fi
 if test $enable_ipv6 = yes; then
  have_ipv6=no
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#   include <sys/types.h>
 #   include <sys/socket.h>
    ]], [[
    struct sockaddr_storage ss;
@ -488,7 +460,6 @@ if test $enable_ipv6 = yes; then
    dnl ********************************************************************
    AC_MSG_CHECKING([struct sockaddr::ss_family])
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#     include <sys/types.h>
 #     include <sys/socket.h>
      ]], [[
      struct sockaddr_storage ss ;
@ -501,7 +472,6 @@ if test $enable_ipv6 = yes; then
    if test x$have_ss_family = xno ; then
      AC_MSG_CHECKING([broken struct sockaddr::ss_family])
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#       include <sys/types.h>
 #       include <sys/socket.h>
        ]], [[
        struct sockaddr_storage ss ;
--- a/nanoftp.c
+++ b/nanoftp.c
@ -48,9 +48,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif

 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
--- a/nanohttp.c
+++ b/nanohttp.c
@ -22,9 +22,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
--- a/runsuite.c
+++ b/runsuite.c
@ -13,7 +13,6 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

--- a/runtest.c
+++ b/runtest.c
@ -18,7 +18,6 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

--- a/runxmlconf.c
+++ b/runxmlconf.c
@ -15,7 +15,6 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

--- a/testlimits.c
+++ b/testlimits.c
@ -17,7 +17,6 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
--- a/testrecurse.c
+++ b/testrecurse.c
@ -17,7 +17,6 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

--- a/xmlIO.c
+++ b/xmlIO.c
@ -15,9 +15,6 @@
 #include <stdlib.h>
 #include <errno.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
--- a/xmllint.c
+++ b/xmllint.c
@ -20,9 +20,6 @@
 #ifdef HAVE_SYS_TIMEB_H
 #include <sys/timeb.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
--- a/xzlib.c
+++ b/xzlib.c
@ -14,9 +14,6 @@
 #include <stdlib.h>
 #include <errno.h>

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif