Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 414263d

Browse files
kbleeskasal
authored andcommitted
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 <[email protected]> Signed-off-by: Erik Faye-Lund <[email protected]>
1 parent 06c1292 commit 414263d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compat/win32/dirent.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ typedef struct DIR DIR;
99
#define DT_LNK 3
1010

1111
struct dirent {
12-
long d_ino; /* Always zero. */
1312
char d_name[FILENAME_MAX]; /* File name. */
1413
union {
1514
unsigned short d_reclen; /* Always zero. */

config.mak.uname

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ ifeq ($(uname_S),Windows)
356356
NO_POSIX_GOODIES = UnfortunatelyYes
357357
NATIVE_CRLF = YesPlease
358358
DEFAULT_HELP_FORMAT = html
359+
NO_D_INO_IN_DIRENT = YesPlease
359360

360361
CC = compat/vcbuild/scripts/clink.pl
361362
AR = compat/vcbuild/scripts/lib.pl
@@ -508,6 +509,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
508509
NO_INET_NTOP = YesPlease
509510
NO_POSIX_GOODIES = UnfortunatelyYes
510511
DEFAULT_HELP_FORMAT = html
512+
NO_D_INO_IN_DIRENT = YesPlease
511513
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
512514
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
513515
COMPAT_OBJS += compat/mingw.o compat/winansi.o \

0 commit comments

Comments
 (0)