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 cc453d2396ef9ba93f29625722e46d05ee7fc456..02218b3be1bba1d842c6f8dc1724968179a560ef 100644 (file)
--- 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 c6c8556371d70fd9ffaf43f3dd10bbde38459476..7a67d112759cbd370854668b8f07f5e71290b303 100644 (file)
--- 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 6493ccb468715233a9eba1b05701e3170e87d7ac..24883d2db2f233ec651507415a47a0161529205b 100644 (file)
--- 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 95f0cac49c6ad6313dcd6e7898f8be15b25dc9aa..d4eb6b8c0a047f57fcc80c5b2581c21a200bd7a8 100644 (file)
--- 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 eaa4dec764672626fa9288e49efdd53fec653805..3f1fd8cc30b7773635ff2d12bcf0d2fa2c5c6aa6 100644 (file)
--- 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 38f647791414357b49810ad20f84450649dee75a..30360b18b43a1df63e5933ff752bb514cef45f78 100644 (file)
--- 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"