about summary refs log tree commit diff
path: root/src/systemd/sd-adapt
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-09-08 17:44:52 +0200
committerMichael Biebl <biebl@debian.org>2018-09-08 17:44:52 +0200
commitd8cad4490d54acb162ad218a8a682ab379bb8bcc (patch)
tree140abd545d62a1b0144be27c93ad8edb021e4311 /src/systemd/sd-adapt
parente3bc109cd0eb97346c448f591af518d85dbee21b (diff)
parent8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff)
Update upstream source from tag 'upstream/1.13.90'
Update to upstream version '1.13.90'
with Debian dir d7d3d98e1240df49343a72511602da7099232e10
Diffstat (limited to 'src/systemd/sd-adapt')
-rw-r--r--src/systemd/sd-adapt/libudev.h5
-rw-r--r--src/systemd/sd-adapt/nm-sd-adapt.h13
-rw-r--r--src/systemd/sd-adapt/sd-device.h (renamed from src/systemd/sd-adapt/env-util.h)0
-rw-r--r--src/systemd/sd-adapt/udev-util.h3
-rw-r--r--src/systemd/sd-adapt/udev.h6
5 files changed, 0 insertions, 27 deletions
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/env-util.h b/src/systemd/sd-adapt/sd-device.h
index 637892c2..637892c2 100644
--- a/src/systemd/sd-adapt/env-util.h
+++ b/src/systemd/sd-adapt/sd-device.h
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"