Browse Source

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>
maint
Karsten Blees 14 years ago committed by Junio C Hamano
parent
commit
1d94c403fd
  1. 1
      compat/win32/dirent.h
  2. 2
      config.mak.uname

1
compat/win32/dirent.h

@ -9,7 +9,6 @@ typedef struct DIR DIR; @@ -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. */

2
config.mak.uname

@ -349,6 +349,7 @@ ifeq ($(uname_S),Windows) @@ -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))) @@ -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 \

Loading…
Cancel
Save