From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 18 Jun 2025 00:36:52 +0000 (+0900)
Subject: basic: move missing_socket.h -> include/sys/socket.h
X-Git-Tag: v258-rc1~193^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=549f679a49bec3525e961014cf04453e6190bb9e;p=thirdparty%2Fsystemd.git

basic: move missing_socket.h -> include/sys/socket.h
---

diff --git a/src/basic/missing_socket.h b/src/basic/include/sys/socket.h
similarity index 95%
rename from src/basic/missing_socket.h
rename to src/basic/include/sys/socket.h
index cc453d2396e..02218b3be1b 100644
--- a/src/basic/missing_socket.h
+++ b/src/basic/include/sys/socket.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h> /* IWYU pragma: export */
+#include_next <sys/socket.h>
 
 /* Supported since kernel v6.5 (5e2ff6704a275be009be8979af17c52361b79b89) */
 #ifndef SO_PASSPIDFD
diff --git a/src/basic/meson.build b/src/basic/meson.build
index c6c8556371d..7a67d112759 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -127,7 +127,7 @@ basic_sources += missing_syscall_def_h
 generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
         output : 'af-list.txt',
-        command : [generate_af_list, cpp, files('missing_socket.h')],
+        command : [generate_af_list, cpp, files('include/sys/socket.h')],
         capture : true)
 
 generate_arphrd_list = find_program('generate-arphrd-list.sh')
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 6493ccb4687..24883d2db2f 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -13,7 +13,6 @@
 #include "forward.h"
 #include "memory-util.h"
 #include "missing_network.h"
-#include "missing_socket.h"
 
 union sockaddr_union {
         /* The minimal, abstract version */
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 95f0cac49c6..d4eb6b8c0a0 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -25,7 +25,6 @@
 #include "json-util.h"
 #include "memstream-util.h"
 #include "missing_network.h"
-#include "missing_socket.h"
 #include "ordered-set.h"
 #include "parse-util.h"
 #include "random-util.h"
diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index eaa4dec7646..3f1fd8cc30b 100644
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -10,7 +10,6 @@
 #include "generator.h"
 #include "install.h"
 #include "log.h"
-#include "missing_socket.h"
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c
index 38f64779141..30360b18b43 100644
--- a/src/ssh-generator/ssh-proxy.c
+++ b/src/ssh-generator/ssh-proxy.c
@@ -10,7 +10,6 @@
 #include "iovec-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_socket.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"