You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
983 B
39 lines
983 B
8 years ago
|
diff -u -r ../emacs-25.2/src/filelock.c ./src/filelock.c
|
||
|
|
--- ../emacs-25.2/src/filelock.c 2017-02-03 11:25:45.000000000 +0100
|
||
|
|
+++ ./src/filelock.c 2017-06-30 23:36:35.331596590 +0200
|
||
|
|
@@ -126,14 +126,14 @@
|
||
|
|
static time_t boot_time;
|
||
|
|
static bool boot_time_initialized;
|
||
|
|
|
||
|
|
-#ifdef BOOT_TIME
|
||
|
|
+#if defined(BOOT_TIME) && !defined(__ANDROID__)
|
||
|
|
static void get_boot_time_1 (const char *, bool);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
static time_t
|
||
|
|
get_boot_time (void)
|
||
|
|
{
|
||
|
|
-#if defined (BOOT_TIME)
|
||
|
|
+#if defined (BOOT_TIME) && !defined(__ANDROID__)
|
||
|
|
int counter;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -169,7 +169,7 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if defined (BOOT_TIME)
|
||
|
|
+#if defined (BOOT_TIME) && !defined(__ANDROID__)
|
||
|
|
#ifndef CANNOT_DUMP
|
||
|
|
/* The utmp routines maintain static state.
|
||
|
|
Don't touch that state unless we are initialized,
|
||
|
|
@@ -237,7 +237,7 @@
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
-#ifdef BOOT_TIME
|
||
|
|
+#if defined(BOOT_TIME) && !defined(__ANDROID__)
|
||
|
|
/* Try to get the boot time from wtmp file FILENAME.
|
||
|
|
This succeeds if that file contains a reboot record.
|
||
|
|
|