From 6518e361171f64bcaaa4bf868139362ed95cc2e0 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 20 Oct 2018 01:30:31 +0200
Subject: New upstream version 1.14.2

---
 src/systemd/sd-adapt/env-util.h    |  3 ---
 src/systemd/sd-adapt/libudev.h     |  5 -----
 src/systemd/sd-adapt/nm-sd-adapt.h | 13 -------------
 src/systemd/sd-adapt/sd-device.h   |  3 +++
 src/systemd/sd-adapt/udev-util.h   |  3 ---
 src/systemd/sd-adapt/udev.h        |  6 ------
 6 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 src/systemd/sd-adapt/env-util.h
 delete mode 100644 src/systemd/sd-adapt/libudev.h
 create mode 100644 src/systemd/sd-adapt/sd-device.h
 delete mode 100644 src/systemd/sd-adapt/udev-util.h
 delete mode 100644 src/systemd/sd-adapt/udev.h

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

diff --git a/src/systemd/sd-adapt/env-util.h b/src/systemd/sd-adapt/env-util.h
deleted file mode 100644
index 637892c2..00000000
--- a/src/systemd/sd-adapt/env-util.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-/* dummy header */
diff --git a/src/systemd/sd-adapt/libudev.h b/src/systemd/sd-adapt/libudev.h
deleted file mode 100644
index 8c49f075..00000000
--- a/src/systemd/sd-adapt/libudev.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-/* dummy header */
-
-struct udev_device;
diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
index 380cbc60..e163eeda 100644
--- a/src/systemd/sd-adapt/nm-sd-adapt.h
+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
@@ -26,10 +26,6 @@
 #include <sys/resource.h>
 #include <time.h>
 
-#ifndef CLOCK_BOOTTIME
-#define CLOCK_BOOTTIME 7
-#endif
-
 #if defined(HAVE_DECL_REALLOCARRAY) && HAVE_DECL_REALLOCARRAY == 1
 #define HAVE_REALLOCARRAY 1
 #else
@@ -180,15 +176,6 @@ sd_notify (int unset_environment, const char *state)
 #define MAX_HANDLE_SZ 128
 #endif
 
-/*
- * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
- * CLOCK_BOOTTIME even though the kernel supports it, so provide a
- * local definition
- */
-#ifndef CLOCK_BOOTTIME
-#define CLOCK_BOOTTIME 7
-#endif
-
 #include "sd-id128.h"
 #include "sparse-endian.h"
 #include "async.h"
diff --git a/src/systemd/sd-adapt/sd-device.h b/src/systemd/sd-adapt/sd-device.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/src/systemd/sd-adapt/sd-device.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
deleted file mode 100644
index 637892c2..00000000
--- a/src/systemd/sd-adapt/udev-util.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-/* dummy header */
diff --git a/src/systemd/sd-adapt/udev.h b/src/systemd/sd-adapt/udev.h
deleted file mode 100644
index 419abcbf..00000000
--- a/src/systemd/sd-adapt/udev.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-/* dummy header */
-
-#include "libudev.h"
-#include "strv.h"
-- 
cgit 1.3.0-6-gf8a5