Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-28

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 180-191)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 39-44)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0978e8835ca..513bc8f21ba 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * emacsclient.c: Avoid expansion of getcwd when defined as a macro.
+
 2005-03-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * make-docfile.c: Undo previous change.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 24dcdffff2c..90c0228f720 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not VMS */
 
 char *getenv (), *getwd ();
-char *getcwd ();
+char *(getcwd) ();
 
 #ifndef VERSION
 #define VERSION "unspecified"