dhcp: ensure every systemd dhcp file includes 'nm-sd-adapt.h' first

src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 #include <linux/if_packet.h>
 

src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <stdint.h>

src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/ip6.h>
 #include <netinet/udp.h>
 

src/dhcp-manager/systemd-dhcp/src/shared/async.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 int asynchronous_job(void* (*func)(void *p), void *arg);
 
 int asynchronous_sync(void);

src/dhcp-manager/systemd-dhcp/src/shared/fileio.h

@@ -20,6 +20,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
+
+#include "nm-sd-adapt.h"
+
 #include <stddef.h>
 #include <stdio.h>
 

src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 #include "macro.h"

src/dhcp-manager/systemd-dhcp/src/shared/list.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* The head of the linked list. Use this in the structure that shall
  * contain the head of the linked list */
 #define LIST_HEAD(t,name)                                               \

src/dhcp-manager/systemd-dhcp/src/shared/macro.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <assert.h>
 #include <sys/param.h>
 #include <sys/types.h>

src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* A type-safe atomic refcounter */
 
 typedef struct {

src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c

@@ -14,6 +14,7 @@
 
    (Minimal changes made by Lennart Poettering, to make clean for inclusion in systemd)
 */
+
 #include "nm-sd-adapt.h"
 
 #include <stdint.h>

src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <sys/types.h>
 

src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>

src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h

@@ -21,6 +21,8 @@
 #ifndef SPARSE_ENDIAN_H
 #define SPARSE_ENDIAN_H
 
+#include "nm-sd-adapt.h"
+
 #include <byteswap.h>
 #include <endian.h>
 #include <stdint.h>

src/dhcp-manager/systemd-dhcp/src/shared/strv.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 

src/dhcp-manager/systemd-dhcp/src/shared/time-util.h

@@ -21,14 +21,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
 
-#include "nm-sd-adapt.h"
-
 #define NSEC_FMT "%" PRIu64
 #define USEC_FMT "%" PRIu64
 

src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 
 static inline uint16_t unaligned_read_be16(const void *_u) {

src/dhcp-manager/systemd-dhcp/src/shared/utf8.h

@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdbool.h>
 
 #include "macro.h"

src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* This is a private header; never even think of including this directly! */
 
 #if __INCLUDE_LEVEL__ <= 1

src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 

src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h

@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 

src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <net/ethernet.h>
 
 #include "sd-event.h"

src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h

@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 typedef struct sd_dhcp6_lease sd_dhcp6_lease;

src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/types.h>
 #include <sys/signalfd.h>
 #include <sys/epoll.h>

src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h

@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <string.h>