d743bb5bcc
This reverts commits3fb4a15096and0e8350ca14. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 400d52221daba3d0480b11b631a6c9972b7ba939 Mon Sep 17 00:00:00 2001
|
|
From: Michal Sekletar <msekletar@users.noreply.github.com>
|
|
Date: Fri, 10 Mar 2017 15:16:24 +0100
|
|
Subject: [PATCH] Fix typo in function name (#5565)
|
|
|
|
(cherry picked from commit 8feabc46263079cffba8a39c4082563320aeffc0)
|
|
---
|
|
man/sd_journal_get_fd.xml | 4 ++--
|
|
man/sd_login_monitor_new.xml | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
|
|
index 61293f7f99..2e686caccb 100644
|
|
--- a/man/sd_journal_get_fd.xml
|
|
+++ b/man/sd_journal_get_fd.xml
|
|
@@ -146,7 +146,7 @@ if (t == (uint64_t) -1)
|
|
else {
|
|
struct timespec ts;
|
|
uint64_t n;
|
|
- clock_getttime(CLOCK_MONOTONIC, &ts);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
|
|
msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
|
|
}</programlisting>
|
|
@@ -304,7 +304,7 @@ int wait_for_changes(sd_journal *j) {
|
|
else {
|
|
struct timespec ts;
|
|
uint64_t n;
|
|
- clock_getttime(CLOCK_MONOTONIC, &ts);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
|
|
msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
|
|
}
|
|
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
|
|
index 5625ab9207..129c99f97d 100644
|
|
--- a/man/sd_login_monitor_new.xml
|
|
+++ b/man/sd_login_monitor_new.xml
|
|
@@ -203,7 +203,7 @@ if (t == (uint64_t) -1)
|
|
else {
|
|
struct timespec ts;
|
|
uint64_t n;
|
|
- clock_getttime(CLOCK_MONOTONIC, &ts);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
|
|
msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
|
|
}</programlisting>
|