diff options
36 files changed, 86 insertions, 62 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8699bd0a86..f5cf129897 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ SUBDIRS += \ endif SYSTEMD_NM_CFLAGS_PATHS = \ + -I$(top_srcdir)/src/systemd/sd-adapt/ \ -I$(top_srcdir)/src/systemd/src/systemd \ -I$(top_srcdir)/src/systemd/src/libsystemd-network \ -I$(top_srcdir)/src/systemd/src/basic \ @@ -107,6 +108,24 @@ libsystemd_nm_la_SOURCES = \ systemd/nm-sd.h \ systemd/nm-sd-adapt.c \ systemd/nm-sd-adapt.h \ + systemd/sd-adapt/build.h \ + systemd/sd-adapt/cgroup-util.h \ + systemd/sd-adapt/condition.h \ + systemd/sd-adapt/conf-parser.h \ + systemd/sd-adapt/def.h \ + systemd/sd-adapt/dirent-util.h \ + systemd/sd-adapt/formats-util.h \ + systemd/sd-adapt/gunicode.h \ + systemd/sd-adapt/libudev.h \ + systemd/sd-adapt/missing.h \ + systemd/sd-adapt/mkdir.h \ + systemd/sd-adapt/process-util.h \ + systemd/sd-adapt/sd-daemon.h \ + systemd/sd-adapt/stat-util.h \ + systemd/sd-adapt/udev-util.h \ + systemd/sd-adapt/udev.h \ + systemd/sd-adapt/user-util.h \ + systemd/sd-adapt/virt.h \ systemd/src/basic/alloc-util.c \ systemd/src/basic/alloc-util.h \ systemd/src/basic/async.h \ diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 010c8a80f6..cf27c1af1e 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -140,8 +140,12 @@ sd_notify (int unset_environment, const char *state) } /* Can't include both net/if.h and linux/if.h; so have to define this here */ +#ifndef IF_NAMESIZE +#define IF_NAMESIZE 16 +#endif + #ifndef IFNAMSIZ -#define IFNAMSIZ 16 +#define IFNAMSIZ IF_NAMESIZE #endif #ifndef MAX_HANDLE_SZ diff --git a/src/systemd/sd-adapt/build.h b/src/systemd/sd-adapt/build.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/build.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/cgroup-util.h b/src/systemd/sd-adapt/cgroup-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/cgroup-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/condition.h b/src/systemd/sd-adapt/condition.h new file mode 100644 index 0000000000..d3a6812af0 --- /dev/null +++ b/src/systemd/sd-adapt/condition.h @@ -0,0 +1,5 @@ +#pragma once + +/* dummy header */ + +typedef struct _sd_adapt_Condition Condition; diff --git a/src/systemd/sd-adapt/conf-parser.h b/src/systemd/sd-adapt/conf-parser.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/conf-parser.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/def.h b/src/systemd/sd-adapt/def.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/def.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/dirent-util.h b/src/systemd/sd-adapt/dirent-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/dirent-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/formats-util.h b/src/systemd/sd-adapt/formats-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/formats-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/gunicode.h b/src/systemd/sd-adapt/gunicode.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/gunicode.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/libudev.h b/src/systemd/sd-adapt/libudev.h new file mode 100644 index 0000000000..8c49f07581 --- /dev/null +++ b/src/systemd/sd-adapt/libudev.h @@ -0,0 +1,5 @@ +#pragma once + +/* dummy header */ + +struct udev_device; diff --git a/src/systemd/sd-adapt/missing.h b/src/systemd/sd-adapt/missing.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/missing.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/mkdir.h b/src/systemd/sd-adapt/mkdir.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/mkdir.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/process-util.h b/src/systemd/sd-adapt/process-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/process-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/sd-daemon.h b/src/systemd/sd-adapt/sd-daemon.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/sd-daemon.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/stat-util.h b/src/systemd/sd-adapt/stat-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/stat-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/udev-util.h b/src/systemd/sd-adapt/udev-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/udev-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/udev.h b/src/systemd/sd-adapt/udev.h new file mode 100644 index 0000000000..00f60f92e4 --- /dev/null +++ b/src/systemd/sd-adapt/udev.h @@ -0,0 +1,5 @@ +#pragma once + +/* dummy header */ + +#include "libudev.h" diff --git a/src/systemd/sd-adapt/user-util.h b/src/systemd/sd-adapt/user-util.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/user-util.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/sd-adapt/virt.h b/src/systemd/sd-adapt/virt.h new file mode 100644 index 0000000000..637892c2d6 --- /dev/null +++ b/src/systemd/sd-adapt/virt.h @@ -0,0 +1,3 @@ +#pragma once + +/* dummy header */ diff --git a/src/systemd/src/basic/escape.h b/src/systemd/src/basic/escape.h index b8ec96ad76..24729dc160 100644 --- a/src/systemd/src/basic/escape.h +++ b/src/systemd/src/basic/escape.h @@ -28,9 +28,7 @@ #endif /* NM_IGNORED */ #include "string-util.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ /* What characters are special in the shell? */ /* must be escaped outside and inside double-quotes */ diff --git a/src/systemd/src/basic/fd-util.c b/src/systemd/src/basic/fd-util.c index 0be0ceff40..c518f7574e 100644 --- a/src/systemd/src/basic/fd-util.c +++ b/src/systemd/src/basic/fd-util.c @@ -29,9 +29,7 @@ #include "fd-util.h" #include "fs-util.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #include "parse-util.h" #include "path-util.h" #include "socket-util.h" diff --git a/src/systemd/src/basic/fs-util.c b/src/systemd/src/basic/fs-util.c index b291c9fcf7..de0cd8fb5e 100644 --- a/src/systemd/src/basic/fs-util.c +++ b/src/systemd/src/basic/fs-util.c @@ -30,30 +30,22 @@ #include <unistd.h> #include "alloc-util.h" -#if 0 /* NM_IGNORED */ #include "dirent-util.h" -#endif /* NM_IGNORED */ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" #include "log.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" #include "mkdir.h" -#endif /* NM_IGNORED */ #include "parse-util.h" #include "path-util.h" -#if 0 /* NM_IGNORED */ #include "stat-util.h" -#endif /* NM_IGNORED */ #include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "time-util.h" -#if 0 /* NM_IGNORED */ #include "user-util.h" -#endif /* NM_IGNORED */ #include "util.h" int unlink_noerrno(const char *path) { diff --git a/src/systemd/src/basic/hashmap.c b/src/systemd/src/basic/hashmap.c index 228b7605e5..dc6bcab0de 100644 --- a/src/systemd/src/basic/hashmap.c +++ b/src/systemd/src/basic/hashmap.c @@ -29,9 +29,7 @@ #include "hashmap.h" #include "macro.h" #include "mempool.h" -#if 0 /* NM_IGNORED */ #include "process-util.h" -#endif /* NM_IGNORED */ #include "random-util.h" #include "set.h" #include "siphash24.h" diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c index b2b503278b..2738663185 100644 --- a/src/systemd/src/basic/parse-util.c +++ b/src/systemd/src/basic/parse-util.c @@ -31,9 +31,7 @@ #include "extract-word.h" #include "macro.h" #include "parse-util.h" -#if 0 /* NM_IGNORED */ #include "process-util.h" -#endif /* NM_IGNORED */ #include "string-util.h" int parse_boolean(const char *v) { diff --git a/src/systemd/src/basic/path-util.c b/src/systemd/src/basic/path-util.c index 8c4dec5b6c..86d35bbee1 100644 --- a/src/systemd/src/basic/path-util.c +++ b/src/systemd/src/basic/path-util.c @@ -38,13 +38,9 @@ #include "fs-util.h" #include "log.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #include "path-util.h" -#if 0 /* NM_IGNORED */ #include "stat-util.h" -#endif /* NM_IGNORED */ #include "string-util.h" #include "strv.h" #include "time-util.h" diff --git a/src/systemd/src/basic/random-util.c b/src/systemd/src/basic/random-util.c index f642c3adbd..1d8ca882b9 100644 --- a/src/systemd/src/basic/random-util.c +++ b/src/systemd/src/basic/random-util.c @@ -34,9 +34,7 @@ #include "fd-util.h" #include "io-util.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif #include "random-util.h" #include "time-util.h" diff --git a/src/systemd/src/basic/socket-util.c b/src/systemd/src/basic/socket-util.c index 6a7dc28b5e..be57d82915 100644 --- a/src/systemd/src/basic/socket-util.c +++ b/src/systemd/src/basic/socket-util.c @@ -36,23 +36,17 @@ #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" -#if 0 /* NM_IGNORED */ #include "formats-util.h" -#endif /* NM_IGNORED */ #include "log.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #include "parse-util.h" #include "path-util.h" #include "socket-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" -#if 0 /* NM_IGNORED */ #include "user-util.h" -#endif /* NM_IGNORED */ #include "utf8.h" #include "util.h" diff --git a/src/systemd/src/basic/string-util.c b/src/systemd/src/basic/string-util.c index fe554ff4c1..b4e774cc00 100644 --- a/src/systemd/src/basic/string-util.c +++ b/src/systemd/src/basic/string-util.c @@ -27,9 +27,7 @@ #include <string.h> #include "alloc-util.h" -#if 0 /* NM_IGNORED */ #include "gunicode.h" -#endif /* NM_IGNORED */ #include "macro.h" #include "string-util.h" #include "utf8.h" diff --git a/src/systemd/src/basic/utf8.h b/src/systemd/src/basic/utf8.h index 1bc23dc11c..322dac20fc 100644 --- a/src/systemd/src/basic/utf8.h +++ b/src/systemd/src/basic/utf8.h @@ -27,9 +27,7 @@ #endif /* NM_IGNORED */ #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd" #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf" diff --git a/src/systemd/src/basic/util.c b/src/systemd/src/basic/util.c index 248a525ba0..79c7aa464a 100644 --- a/src/systemd/src/basic/util.c +++ b/src/systemd/src/basic/util.c @@ -37,41 +37,29 @@ #include <unistd.h> #include "alloc-util.h" -#if 0 /* NM_IGNORED */ #include "build.h" #include "cgroup-util.h" #include "def.h" #include "dirent-util.h" -#endif /* NM_IGNORED */ #include "fd-util.h" #include "fileio.h" -#if 0 /* NM_IGNORED */ #include "formats-util.h" -#endif /* NM_IGNORED */ #include "hashmap.h" #include "hostname-util.h" #include "log.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #include "parse-util.h" #include "path-util.h" -#if 0 /* NM_IGNORED */ #include "process-util.h" -#endif /* NM_IGNORED */ #include "set.h" #include "signal-util.h" -#if 0 /* NM_IGNORED */ #include "stat-util.h" -#endif /* NM_IGNORED */ #include "string-util.h" #include "strv.h" #include "time-util.h" #include "umask-util.h" -#if 0 /* NM_IGNORED */ #include "user-util.h" -#endif /* NM_IGNORED */ #include "util.h" /* Put this test here for a lack of better place */ diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h index b8776636bf..bb2fc318ef 100644 --- a/src/systemd/src/basic/util.h +++ b/src/systemd/src/basic/util.h @@ -41,13 +41,9 @@ #include <time.h> #include <unistd.h> -#if 0 /* NM_IGNORED */ #include "formats-util.h" -#endif /* NM_IGNORED */ #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif /* NM_IGNORED */ #include "time-util.h" size_t page_size(void) _pure_; diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/systemd/src/libsystemd-network/dhcp-identifier.c index 69eecd0234..c1fa876373 100644 --- a/src/systemd/src/libsystemd-network/dhcp-identifier.c +++ b/src/systemd/src/libsystemd-network/dhcp-identifier.c @@ -19,9 +19,7 @@ #include "nm-sd-adapt.h" -#if 0 /* NM_IGNORED */ #include "libudev.h" -#endif /* NM_IGNORED */ #include "sd-id128.h" #include "dhcp-identifier.h" @@ -29,9 +27,10 @@ #include "network-internal.h" #include "siphash24.h" #include "sparse-endian.h" -#if 0 /* NM_IGNORED */ #include "udev-util.h" #include "virt.h" + +#if 0 /* NM_IGNORED */ #else /* NM_IGNORED */ #include <net/if.h> #endif /* NM_IGNORED */ diff --git a/src/systemd/src/libsystemd-network/network-internal.c b/src/systemd/src/libsystemd-network/network-internal.c index 292217fea2..46bddfebe1 100644 --- a/src/systemd/src/libsystemd-network/network-internal.c +++ b/src/systemd/src/libsystemd-network/network-internal.c @@ -26,10 +26,8 @@ #include "sd-ndisc.h" #include "alloc-util.h" -#if 0 /* NM_IGNORED */ #include "condition.h" #include "conf-parser.h" -#endif /* NM_IGNORED */ #include "dhcp-lease-internal.h" #include "ether-addr-util.h" #include "hexdecoct.h" diff --git a/src/systemd/src/libsystemd-network/network-internal.h b/src/systemd/src/libsystemd-network/network-internal.h index e91d3d2918..5bcd577167 100644 --- a/src/systemd/src/libsystemd-network/network-internal.h +++ b/src/systemd/src/libsystemd-network/network-internal.h @@ -23,7 +23,6 @@ #include "sd-dhcp-lease.h" -#if 0 /* NM_IGNORED */ #include "condition.h" #include "udev.h" @@ -65,7 +64,6 @@ int config_parse_iaid(const char *unit, const char *filename, unsigned line, int net_get_unique_predictable_data(struct udev_device *device, uint64_t *result); const char *net_get_name(struct udev_device *device); -#endif /* NM_IGNORED */ void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size); int deserialize_in_addrs(struct in_addr **addresses, const char *string); diff --git a/src/systemd/src/libsystemd/sd-event/sd-event.c b/src/systemd/src/libsystemd/sd-event/sd-event.c index d91e3763c3..0d400661d2 100644 --- a/src/systemd/src/libsystemd/sd-event/sd-event.c +++ b/src/systemd/src/libsystemd/sd-event/sd-event.c @@ -23,9 +23,7 @@ #include <sys/timerfd.h> #include <sys/wait.h> -#if 0 /* NM_IGNORED */ #include "sd-daemon.h" -#endif #include "sd-event.h" #include "sd-id128.h" @@ -34,13 +32,9 @@ #include "hashmap.h" #include "list.h" #include "macro.h" -#if 0 /* NM_IGNORED */ #include "missing.h" -#endif #include "prioq.h" -#if 0 /* NM_IGNORED */ #include "process-util.h" -#endif #include "set.h" #include "signal-util.h" #include "string-table.h" |