summaryrefslogtreecommitdiff
path: root/src/systemd/src/basic
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-08-11 13:05:14 +0200
committerThomas Haller <thaller@redhat.com>2016-08-12 09:38:48 +0200
commit4c849d148f330c17117b60137740a1e66ac1a237 (patch)
treefe42f59591b1808420bb2262fdc9aac05f5f8802 /src/systemd/src/basic
parent2f296cb8fe22ba5b493a6c7a00437e5af8c1a978 (diff)
downloadNetworkManager-4c849d148f330c17117b60137740a1e66ac1a237.tar.gz
systemd: add dummy header files to adapt compilation of systemd sources
Instead of repeatedly disabling the inclusion like #if 0 /* NM_IGNORED */ #include "missing.h" #endif /* NM_IGNORED */ add dummy header files to "src/systemd/sd-adapt".
Diffstat (limited to 'src/systemd/src/basic')
-rw-r--r--src/systemd/src/basic/escape.h2
-rw-r--r--src/systemd/src/basic/fd-util.c2
-rw-r--r--src/systemd/src/basic/fs-util.c8
-rw-r--r--src/systemd/src/basic/hashmap.c2
-rw-r--r--src/systemd/src/basic/parse-util.c2
-rw-r--r--src/systemd/src/basic/path-util.c4
-rw-r--r--src/systemd/src/basic/random-util.c2
-rw-r--r--src/systemd/src/basic/socket-util.c6
-rw-r--r--src/systemd/src/basic/string-util.c2
-rw-r--r--src/systemd/src/basic/utf8.h2
-rw-r--r--src/systemd/src/basic/util.c12
-rw-r--r--src/systemd/src/basic/util.h4
12 files changed, 0 insertions, 48 deletions
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_;