(init_buffer): Fix error message for failed call to get_current_dir_name.

(get_current_dir_name): Remove prototype.

diff --git a/src/ChangeLog b/src/ChangeLog
index 33da3511c43d2d7644159ea785a085eaef2102fd..18cdcde2719d8c6e872703089b61f0a89045ec8c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2005-09-10  Eli Zaretskii  <eliz@gnu.org>
 
+       * buffer.c (init_buffer): Fix error message for failed call to
+       get_current_dir_name.
+       (get_current_dir_name): Remove prototype.
+
+       * xsmfns.c: (get_current_dir_name): Remove prototype.
+
+       * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]: Add
+       prototype.
+
        * sysdep.c [WINDOWSNT]: Add prototype for getwd.
 
        * config.in: Regenerated.

diff --git a/src/buffer.c b/src/buffer.c
index b0227031ac73a410fca5a5911420d69b878bd5cf..448ef87413a5ae98ba7a1b14dd3cbef66a7f1591 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -50,8 +50,6 @@ extern int errno;
 #include "keymap.h"
 #include "frame.h"
 
-extern char * get_current_dir_name ();
-
 struct buffer *current_buffer;         /* the current buffer */
 
 /* First buffer in chain of all buffers (in reverse order of creation).
@@ -5136,9 +5134,9 @@ init_buffer ()
     Fset_buffer_multibyte (Qnil);
 
   pwd = get_current_dir_name ();
- 
+
   if(!pwd)
-    fatal ("`get_cwd' failed: %s\n", strerror (errno)); 
+    fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
 
 #ifndef VMS
   /* Maybe this should really use some standard subroutine