emacs: Fix building with unified headers
This commit is contained in:
parent
cf21891a80
commit
3436267b24
|
@ -0,0 +1,38 @@
|
|||
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.
|
||||
|
Loading…
Reference in New Issue