# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1415663002 28800
# Node ID dffad0ca4bc1d27011b8e0d45f573d613b6919e8
# Parent  e6ce17a544835882da56d13d8f120fc57537b0a9
fts: port to C89

Problem reported for MSVC 16 by Gisle Vanem in:
http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00027.html
* lib/fts.c (fts_build): Avoid declaration before statement.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	fts: port to C89
+	Problem reported for MSVC 16 by Gisle Vanem in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00027.html
+	* lib/fts.c (fts_build): Avoid declaration before statement.
+
 2014-11-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	unistd: port to iOS
diff --git a/lib/fts.c b/lib/fts.c
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1293,6 +1293,7 @@
         int dir_fd;
         FTSENT *cur = sp->fts_cur;
         bool continue_readdir = !!cur->fts_dirp;
+        size_t max_entries;
 
         /* When cur->fts_dirp is non-NULL, that means we should
            continue calling readdir on that existing DIR* pointer
@@ -1354,8 +1355,7 @@
            function.  But when no such function is specified, we can read
            entries in batches that are large enough to help us with inode-
            sorting, yet not so large that we risk exhausting memory.  */
-        size_t max_entries = (sp->fts_compar == NULL
-                              ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX);
+        max_entries = sp->fts_compar ? SIZE_MAX : FTS_MAX_READDIR_ENTRIES;
 
         /*
          * Nlinks is the number of possible entries of type directory in the