From: Karsten Blees <bl...@dcon.de>
Date: Fri, 7 Jan 2011 17:34:33 +0100

There are no proper inodes on Windows, so remove dirent.d_ino and #define
NO_D_INO_IN_DIRENT in the Makefile (this skips e.g. an ineffective qsort in
fsck.c).

Signed-off-by: Karsten Blees <bl...@dcon.de>
Signed-off-by: Erik Faye-Lund <kusmab...@gmail.com>
Signed-off-by: Stepan Kasal <ka...@ucw.cz>
---
 compat/win32/dirent.h | 1 -
 config.mak.uname      | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h
index 927a25c..b38973b 100644
--- a/compat/win32/dirent.h
+++ b/compat/win32/dirent.h
@@ -9,7 +9,6 @@ typedef struct DIR DIR;
 #define DT_LNK     3
 
 struct dirent {
-       long d_ino;                      /* Always zero. */
        char d_name[FILENAME_MAX];       /* File name. */
        union {
                unsigned short d_reclen; /* Always zero. */
diff --git a/config.mak.uname b/config.mak.uname
index 1ae675b..8131c81 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -354,6 +354,7 @@ ifeq ($(uname_S),Windows)
        NO_POSIX_GOODIES = UnfortunatelyYes
        NATIVE_CRLF = YesPlease
        DEFAULT_HELP_FORMAT = html
+       NO_D_INO_IN_DIRENT = YesPlease
 
        CC = compat/vcbuild/scripts/clink.pl
        AR = compat/vcbuild/scripts/lib.pl
@@ -503,6 +504,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
        NO_INET_NTOP = YesPlease
        NO_POSIX_GOODIES = UnfortunatelyYes
        DEFAULT_HELP_FORMAT = html
+       NO_D_INO_IN_DIRENT = YesPlease
        COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI 
-Icompat -Icompat/win32
        COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
        COMPAT_OBJS += compat/mingw.o compat/winansi.o \
-- 
2.0.0.9635.g0be03cb

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to