merge from trunk

[gnu-emacs] / src / filelock.c

diff --git a/src/filelock.c b/src/filelock.c
index 25ca23fdee4b41a8cf908f4e982bcbe2c8ab9cda..15ed546bc506c58bd86f6fa47489fd5b5eed35f5 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -118,7 +118,7 @@ static time_t boot_time;
 static int boot_time_initialized;
 
 #ifdef BOOT_TIME
-static void get_boot_time_1 (char *, int);
+static void get_boot_time_1 (const char *, int);
 #endif
 
 static time_t
@@ -249,7 +249,7 @@ get_boot_time (void)
    Success is indicated by setting BOOT_TIME to a larger value.  */
 
 void
-get_boot_time_1 (char *filename, int newest)
+get_boot_time_1 (const char *filename, int newest)
 {
   struct utmp ut, *utp;
   int desc;
@@ -360,8 +360,8 @@ lock_file_1 (char *lfname, int force)
 {
   register int err;
   time_t boot_time;
-  char *user_name;
-  char *host_name;
+  const char *user_name;
+  const char *host_name;
   char *lock_info_str;
 
   /* Call this first because it can GC.  */