From: Jim Meyering <jim@meyering.net>
Date: Tue, 21 Nov 2006 09:15:22 +0000 (+0000)
Subject: * lib/fts.c (fts_safe_changedir): Move a declaration "up",
X-Git-Tag: cvs-readonly~1537
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f8a6c13af52d84516816b590c5d63cc91c8d27d2;p=gnulib.git

* lib/fts.c (fts_safe_changedir): Move a declaration "up",
so as to remain compatible with older compilers.
Patch from Michael Deutschmann.
---

diff --git a/ChangeLog b/ChangeLog
index def7c47e0..85b9fed31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-21  Jim Meyering  <jim@meyering.net>
+
+	* lib/fts.c (fts_safe_changedir): Move a declaration "up",
+	so as to remain compatible with older compilers.
+	Patch from Michael Deutschmann.
+
 2006-11-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* MODULES.html.sh (File system functions): Add openat.
diff --git a/lib/fts.c b/lib/fts.c
index db6674843..b3b021021 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1645,8 +1645,9 @@ fts_safe_changedir (FTS *sp, FTSENT *p, int fd, char const *dir)
 	       failure when we lack "x" access to the virtual cwd.  */
 	    if ( ! i_ring_empty (&sp->fts_fd_ring))
 	      {
+		int parent_fd;
 		fd_ring_print (sp, stderr, "pre-pop");
-		int parent_fd = i_ring_pop (&sp->fts_fd_ring);
+		parent_fd = i_ring_pop (&sp->fts_fd_ring);
 		is_dotdot = true;
 		if (0 <= parent_fd)
 		  {