From: Jim Meyering <meyering@redhat.com>
Date: Mon, 16 Feb 2009 14:49:08 +0000 (+0100)
Subject: fts: add #if guards so that the fts_lgpl module still builds
X-Git-Tag: v0.1~6317
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=665a8a0fca396d67dfed85580a48178df8b4a60e;p=gnulib.git

fts: add #if guards so that the fts_lgpl module still builds

* lib/fts.c: Guard just-added hash-table-using parts with
Reported by Simon Josefsson.
---

diff --git a/ChangeLog b/ChangeLog
index bf5e2d044..97d6fb61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-16  Jim Meyering  <meyering@redhat.com>
+
+	fts: add #if guards so that the fts_lgpl module still builds
+	* lib/fts.c: Guard just-added hash-table-using parts with
+	#if GNULIB_FTS, so as not to break builds of the fts_lgpl module.
+	Reported by Simon Josefsson.
+
 2009-02-15  Bruno Haible  <bruno@clisp.org>
 
 	* modules/array-mergesort-tests: New file.
diff --git a/lib/fts.c b/lib/fts.c
index fdbe2586c..f00db41bc 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -618,8 +618,10 @@ fts_close (FTS *sp)
 
 	fd_ring_clear (&sp->fts_fd_ring);
 
+#if GNULIB_FTS
 	if (sp->fts_leaf_optimization_works_ht)
 	  hash_free (sp->fts_leaf_optimization_works_ht);
+#endif
 
 	free_dir (sp);
 
@@ -717,6 +719,7 @@ static bool dirent_inode_sort_may_be_useful (int dir_fd) { return true; }
 static bool leaf_optimization_applies (int dir_fd) { return false; }
 #endif
 
+#if GNULIB_FTS
 /* link-count-optimization entry:
    map an stat.st_dev number to a boolean: leaf_optimization_works */
 struct LCO_ent
@@ -798,6 +801,7 @@ link_count_optimize_ok (FTSENT const *p)
 
   return opt_ok;
 }
+#endif
 
 /*
  * Special case of "/" at the end of the file name so that slashes aren't