From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Apr 2019 21:09:51 +0200
Subject: New upstream version 1.18.0

---
 shared/systemd/sd-adapt-shared/missing.h            | 2 ++
 shared/systemd/sd-adapt-shared/missing_socket.h     | 3 ---
 shared/systemd/sd-adapt-shared/namespace-util.h     | 3 +++
 shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 +-
 shared/systemd/sd-adapt-shared/nulstr-util.h        | 3 +++
 shared/systemd/sd-adapt-shared/strxcpyx.h           | 3 +++
 shared/systemd/sd-adapt-shared/unaligned.h          | 2 +-
 7 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 shared/systemd/sd-adapt-shared/missing_socket.h
 create mode 100644 shared/systemd/sd-adapt-shared/namespace-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/nulstr-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/strxcpyx.h

(limited to 'shared/systemd/sd-adapt-shared')

diff --git a/shared/systemd/sd-adapt-shared/missing.h b/shared/systemd/sd-adapt-shared/missing.h
index 2ee34b6a..d0b460a7 100644
--- a/shared/systemd/sd-adapt-shared/missing.h
+++ b/shared/systemd/sd-adapt-shared/missing.h
@@ -3,4 +3,6 @@
 /* dummy header */
 
 #include "missing_fcntl.h"
+#include "missing_socket.h"
+#include "missing_stat.h"
 #include "missing_type.h"
diff --git a/shared/systemd/sd-adapt-shared/missing_socket.h b/shared/systemd/sd-adapt-shared/missing_socket.h
deleted file mode 100644
index 637892c2..00000000
--- a/shared/systemd/sd-adapt-shared/missing_socket.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-/* dummy header */
diff --git a/shared/systemd/sd-adapt-shared/namespace-util.h b/shared/systemd/sd-adapt-shared/namespace-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/shared/systemd/sd-adapt-shared/namespace-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
index b10722d7..a285c3cd 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -23,7 +23,7 @@
 
 #include <syslog.h>
 
-#include "nm-utils/nm-logging-fwd.h"
+#include "nm-glib-aux/nm-logging-fwd.h"
 
 /*****************************************************************************/
 
diff --git a/shared/systemd/sd-adapt-shared/nulstr-util.h b/shared/systemd/sd-adapt-shared/nulstr-util.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/shared/systemd/sd-adapt-shared/nulstr-util.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/shared/systemd/sd-adapt-shared/strxcpyx.h b/shared/systemd/sd-adapt-shared/strxcpyx.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/shared/systemd/sd-adapt-shared/strxcpyx.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/shared/systemd/sd-adapt-shared/unaligned.h b/shared/systemd/sd-adapt-shared/unaligned.h
index 17dc0444..ac1a6928 100644
--- a/shared/systemd/sd-adapt-shared/unaligned.h
+++ b/shared/systemd/sd-adapt-shared/unaligned.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "nm-utils/unaligned.h"
+#include "nm-std-aux/unaligned.h"
-- 
cgit 1.3.0-6-gf8a5