diff options
| author |  Karsten Blees <blees@dcon.de> | 2011-01-07 17:34:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-09 15:10:52 -0700 |
| commit | 1d94c403fd52eddd2c4d6c0123f64c56a79bfca7 (patch) | |
| tree | 9b9030a3b1c1a2747f16c724a8d22ebd0af7c3ef | |
| parent | Sync with 1.9.4 (diff) | |
| download | tgif-1d94c403fd52eddd2c4d6c0123f64c56a79bfca7.tar.xz | |
Win32 dirent: remove unused dirent.d_ino member
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 <blees@dcon.de>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Stepan Kasal <kasal@ucw.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/win32/dirent.h | 1 | ||||
| -rw-r--r-- | config.mak.uname | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compat/win32/dirent.h b/compat/win32/dirent.h index 927a25ca76..b38973b051 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 23a8803656..f14c160f3c 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -349,6 +349,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 @@ -497,6 +498,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 \ |