kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2011-01-07 17:34:33 +01:00 committed by Junio C Hamano
parent bce14aa132
commit 1d94c403fd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compat/win32/dirent.h
View File

@ -9,7 +9,6 @@ typedef struct DIR DIR;
#define DT_LNK 3 #define DT_LNK 3


struct dirent { struct dirent {
long d_ino; /* Always zero. */
char d_name[FILENAME_MAX]; /* File name. */ char d_name[FILENAME_MAX]; /* File name. */
union { union {
unsigned short d_reclen; /* Always zero. */ unsigned short d_reclen; /* Always zero. */

2
config.mak.uname
View File

@ -349,6 +349,7 @@ ifeq ($(uname_S),Windows)
NO_POSIX_GOODIES = UnfortunatelyYes NO_POSIX_GOODIES = UnfortunatelyYes
NATIVE_CRLF = YesPlease NATIVE_CRLF = YesPlease
DEFAULT_HELP_FORMAT = html DEFAULT_HELP_FORMAT = html
NO_D_INO_IN_DIRENT = YesPlease


CC = compat/vcbuild/scripts/clink.pl CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl AR = compat/vcbuild/scripts/lib.pl
@ -497,6 +498,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_INET_NTOP = YesPlease NO_INET_NTOP = YesPlease
NO_POSIX_GOODIES = UnfortunatelyYes NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html 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 += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \ COMPAT_OBJS += compat/mingw.o compat/winansi.o \