aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-11-27 20:15:25 +0100
committerMax Kellermann <max@duempel.org>2011-11-27 20:15:25 +0100
commitcd108ba3aa9f4b0b8ebea3ce463c1e6e1e5a5abe (patch)
tree08e7a3d7581d71814554c9f5f5c15899dbbd0f14
parent2bb5bfa74e52c3a547e5f46e25156cc8d7cade65 (diff)
directory: rename attribute "stat" to "have_stat"
"stat" is a macro on mingw32, which is a pretty stupid thing, and this commit works around this build failure.
-rw-r--r--src/directory.h2
-rw-r--r--src/update_walk.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/directory.h b/src/directory.h
index 5c36291e..9c0a9b56 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -43,7 +43,7 @@ struct directory {
time_t mtime;
ino_t inode;
dev_t device;
- bool stat; /* not needed if ino_t == dev_t == 0 is impossible */
+ bool have_stat; /* not needed if ino_t == dev_t == 0 is impossible */
char path[sizeof(long)];
};
diff --git a/src/update_walk.c b/src/update_walk.c
index 76c07773..426bd62f 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -86,7 +86,7 @@ directory_set_stat(struct directory *dir, const struct stat *st)
{
dir->inode = st->st_ino;
dir->device = st->st_dev;
- dir->stat = true;
+ dir->have_stat = true;
}
static void
@@ -346,7 +346,7 @@ inodeFoundInParent(struct directory *parent, ino_t inode, dev_t device)
{
#ifndef G_OS_WIN32
while (parent) {
- if (!parent->stat && statDirectory(parent) < 0)
+ if (!parent->have_stat && statDirectory(parent) < 0)
return -1;
if (parent->inode == inode && parent->device == device) {
g_debug("recursive directory found");