From f2e3d2f1256da2a551cfe3fa685e582eb6d09d60 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 10 Aug 2023 11:44:49 +0300 Subject: [PATCH] Streamline definition of BOOT_TIME_FILE on MS-Windows * nt/inc/ms-w32.h: Don't define BOOT_TIME_FILE here... * configure.ac: ...define it here instead, as for the other systems. --- configure.ac | 11 +++++++++++ nt/inc/ms-w32.h | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 0bc0de1bfac..0236dbd89d8 100644 --- a/configure.ac +++ b/configure.ac @@ -2643,6 +2643,17 @@ AC_CACHE_CHECK([for old but post-boot file], do test -f $file && { emacs_cv_boot_time_file=$file; break; } done])], + # This isn't perfect, as some systems might have the page file in + # another place. Also, I suspect that the time stamp of that + # file might also change when Windows enlarges the file due to + # insufficient VM. Still, this seems to be the most reliable + # way; the alternative (of using GetSystemTimes) won't work on + # laptops that hibernate, because the system clock is stopped + # then. Other possibility would be to run "net statistics + # workstation" and parse the output, but that's gross. So this + # should do; if the file is not there, the boot time will be + # returned as zero, and filelock.c already handles that. + [mingw32], [emacs_cv_boot_time_file=C:/pagefile.sys], [*], [emacs_cv_boot_time_file=not-needed])]) AS_CASE([$emacs_cv_boot_time_file], diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 58be1199345..fce15fcbd8c 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -111,18 +111,6 @@ along with GNU Emacs. If not, see . */ # endif #endif -/* This isn't perfect, as some systems might have the page file in - another place. Also, I suspect that the time stamp of that file - might also change when Windows enlarges the file due to - insufficient VM. Still, this seems to be the most reliable way; - the alternative (of using GetSystemTimes) won't work on laptops - that hibernate, because the system clock is stopped then. Other - possibility would be to run "net statistics workstation" and parse - the output, but that's gross. So this should do; if the file is - not there, the boot time will be returned as zero, and filelock.c - already handles that. */ -#define BOOT_TIME_FILE "C:/pagefile.sys" - /* ============================================================ */ /* Here, add any special hacks needed to make Emacs work on this -- 2.39.2