diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 17:58:04 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 17:58:04 +0800 |
| commit | 3af419ed0f0bf23320f8a7ac3479e2c50c353cde (patch) | |
| tree | fa45f6aee9812f8684ca888823c89cdcc89e6ddb /lib/boot-time.c | |
| parent | 101801ca13632ae17b486f690701b9cb36868676 (diff) | |
| parent | 87be53846bfbf5a6387cb5a40105bd0fc5b48b38 (diff) | |
| download | emacs-3af419ed0f0bf23320f8a7ac3479e2c50c353cde.tar.gz | |
Merge upstream Git snapshot into athena/unstable
Diffstat (limited to 'lib/boot-time.c')
| -rw-r--r-- | lib/boot-time.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/boot-time.c b/lib/boot-time.c index f560914962b..c1171e8024d 100644 --- a/lib/boot-time.c +++ b/lib/boot-time.c @@ -203,7 +203,14 @@ get_boot_time_uncached (struct timespec *p_boot_time) } # endif -# else /* old FreeBSD, OpenBSD, native Windows */ +# else /* Adélie Linux, old FreeBSD, OpenBSD, native Windows */ + +# if defined __linux__ && !defined __ANDROID__ + /* Workaround for Adélie Linux: */ + get_linux_boot_time_fallback (&found_boot_time); + if (found_boot_time.tv_sec == 0) + get_linux_boot_time_final_fallback (&found_boot_time); +# endif # if defined __OpenBSD__ /* Workaround for OpenBSD: */ |