Commit | Line | Data |
---|---|---|
5d357c15 FF |
1 | diff -u -r ../emacs-25.2/src/filelock.c ./src/filelock.c |
2 | --- ../emacs-25.2/src/filelock.c 2017-02-03 11:25:45.000000000 +0100 | |
3 | +++ ./src/filelock.c 2017-06-30 23:36:35.331596590 +0200 | |
4 | @@ -126,14 +126,14 @@ | |
5 | static time_t boot_time; | |
6 | static bool boot_time_initialized; | |
7 | ||
8 | -#ifdef BOOT_TIME | |
9 | +#if defined(BOOT_TIME) && !defined(__ANDROID__) | |
10 | static void get_boot_time_1 (const char *, bool); | |
11 | #endif | |
12 | ||
13 | static time_t | |
14 | get_boot_time (void) | |
15 | { | |
16 | -#if defined (BOOT_TIME) | |
17 | +#if defined (BOOT_TIME) && !defined(__ANDROID__) | |
18 | int counter; | |
19 | #endif | |
20 | ||
21 | @@ -169,7 +169,7 @@ | |
22 | } | |
23 | } | |
24 | ||
25 | -#if defined (BOOT_TIME) | |
26 | +#if defined (BOOT_TIME) && !defined(__ANDROID__) | |
27 | #ifndef CANNOT_DUMP | |
28 | /* The utmp routines maintain static state. | |
29 | Don't touch that state unless we are initialized, | |
30 | @@ -237,7 +237,7 @@ | |
31 | #endif | |
32 | } | |
33 | ||
34 | -#ifdef BOOT_TIME | |
35 | +#if defined(BOOT_TIME) && !defined(__ANDROID__) | |
36 | /* Try to get the boot time from wtmp file FILENAME. | |
37 | This succeeds if that file contains a reboot record. | |
38 |