* 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 def7c47e04f3bd193523dab0e6b331fb0b13045e..85b9fed317ffcd97545aa77cb2bbe990cfe0ac93 100644 (file)
--- 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 db6674843e16ff9c66375133436d847a2df39c71..b3b021021d9c43e54efe2a1b61b1e192c97a9845 100644 (file)
--- 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)
                  {