Re: save-cwd.c:33:21: fatal error: xgetcwd.h: No such file or directory

[Jim Meyering]

Rob Vermaas wrote:
> while building latest rcs revision we encountered a problem with
> gnulib. The build fails with
>
>   building save-cwd.o
>   gcc -std=gnu99 -std=gnu99 -DHAVE_CONFIG_H -I. -g -O2 -c -o
> save-cwd.o save-cwd.c
>   save-cwd.c:33:21: fatal error: xgetcwd.h: No such file or directory
>   compilation terminated.
>   make[3]: *** [save-cwd.o] Error 1
>
> (see also http://hydra.nixos.org/build/855203/nixlog/1 )
>
> This seems to be related to the following commit(s):
> http://git.savannah.gnu.org/cgit/gnulib.git/diff/?id=2392b18099a64ffb7aa2cf4fa3c81da96d2a5fc1&id2=03dd3ccd9a02d8406571243b74c6afb08f90ba2b
>
> Removing the xgetcwd.h include from ./lib/save-cwd.c solved the issue
> for me on my local machine.

Thanks!  I'll push this in your name,
once you confirm it's ok (i.e., the email address).
The git logs on master are essentially write-once.

>From 95cd98f083211dc75f071a9a2929111c007340e7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <address@hidden>
Date: Wed, 12 Jan 2011 10:08:53 +0100
Subject: [PATCH] save-cwd: no longer include "xgetcwd.h"

* lib/save-cwd.c: Don't include "xgetcwd.h"; it's no longer used.
This avoids a compilation failure in projects that use save-cwd
without also using the xgetcwd module.
---
 ChangeLog      |    7 +++++++
 lib/save-cwd.c |    1 -
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a2d058..8cffb3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-12  Rob Vermaas  <address@hidden>
+
+       save-cwd: no longer include "xgetcwd.h"
+       * lib/save-cwd.c: Don't include "xgetcwd.h"; it's no longer used.
+       This avoids a compilation failure in projects that use save-cwd
+       without also using the xgetcwd module.
+
 2011-01-11  Paul Eggert  <address@hidden>

        ftoastr: split into 3 modules ftoastr, dtoastr, ldtoastr
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 4801670..16ffa2c 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -30,7 +30,6 @@

 #include "chdir-long.h"
 #include "unistd--.h"
-#include "xgetcwd.h"
 #include "cloexec.h"

 #if GNULIB_FCNTL_SAFER
--
1.7.3.5