From f0fc4478b29dcb0c5bbc0e89c2b84f40b7e76e50 Mon Sep 17 00:00:00 2001
From: jay <jay>
Date: Tue, 19 Jun 2007 22:28:03 +0000
Subject: [PATCH] Applied patch for Savannah bug #20210 by Eric Blake

---
 ChangeLog            | 7 +++++++
 import-gnulib.config | 4 ++--
 lib/dircallback.c    | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29bd8ee..b1cf3d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-19  Eric Blake  <ebb9@byu.net>
+
+	Fix compilation on cygwin, Savannah bug #20210.
+	* import-gnulib.config (gnulib_version): Import strcasestr and
+	updated canonicalize-lgpl-tests.
+	* lib/dircallback.c (includes): Track gnulib changes.
+
 2007-06-14  James Youngman  <jay@gnu.org>
 
 	* find/parser.c (parse_time): Use the variable comp, which holds
diff --git a/import-gnulib.config b/import-gnulib.config
index b3b1db0..9f4db44 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -1,5 +1,5 @@
 # What version of gnulib to use?
-gnulib_version="2007-05-26"
+gnulib_version="2007-06-20"
 
 destdir="gnulib"
 
@@ -26,4 +26,4 @@ modechange pathmax quotearg realloc regex rpmatch savedir \
 stpcpy strdup strftime  c-strstr strtol strtoul strtoull strtoumax  \
 xalloc xalloc-die xgetcwd  xstrtod xstrtol  xstrtoumax yesno human filemode \
 getline stpcpy canonicalize mountlist closeout gettext stat-macros stat-time \
-sys_stat timespec verify wcwidth xstrtod"
+strcasestr sys_stat timespec verify wcwidth xstrtod"
diff --git a/lib/dircallback.c b/lib/dircallback.c
index 81253b9..9bec695 100644
--- a/lib/dircallback.c
+++ b/lib/dircallback.c
@@ -28,9 +28,9 @@
 #include "openat.h"
 #include <stdarg.h>
 #include <stddef.h>
+#include <errno.h>
 
 #include "fcntl--.h"
-#include "lchown.h"
 #include "lstat.h"
 #include "save-cwd.h"
 
@@ -98,4 +98,3 @@ run_in_dir (int dirfd, int (*callback)(void*), void *usercontext)
       return err;
     }
 }
-
-- 
2.11.4.GIT