From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jul 2014 18:34:27 +0000 (-0700)
Subject: Merge branch 'sk/mingw-dirent'
X-Git-Tag: v2.1.0-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b0bae7f0e42f0f020414eb49ea26e82f73ce0db8?ds=inline;hp=-c

Merge branch 'sk/mingw-dirent'

* sk/mingw-dirent:
Win32 dirent: improve dirent implementation
Win32 dirent: clarify #include directives
Win32 dirent: change FILENAME_MAX to MAX_PATH
Win32 dirent: remove unused dirent.d_reclen member
Win32 dirent: remove unused dirent.d_ino member
---

b0bae7f0e42f0f020414eb49ea26e82f73ce0db8
diff --combined config.mak.uname
index 1ae675b053,f14c160f3c..8131c81985
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -28,7 -28,6 +28,7 @@@ ifeq ($(uname_S),OSF1
  	NO_NSEC = YesPlease
  endif
  ifeq ($(uname_S),Linux)
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
@@@ -36,7 -35,6 +36,7 @@@
  	HAVE_DEV_TTY = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
@@@ -105,7 -103,6 +105,7 @@@ ifeq ($(uname_S),SunOS
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease
@@@ -148,7 -145,7 +148,7 @@@
  	endif
  	INSTALL = /usr/ucb/install
  	TAR = gtar
 -	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
 +	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__
  endif
  ifeq ($(uname_O),Cygwin)
  	ifeq ($(shell expr "$(uname_R)" : '1\.[1-6]\.'),4)
@@@ -160,6 -157,7 +160,6 @@@
  		NO_SYMLINK_HEAD = YesPlease
  		NO_IPV6 = YesPlease
  		OLD_ICONV = UnfortunatelyYes
 -		NO_THREAD_SAFE_PREAD = YesPlease
  		# There are conflicting reports about this.
  		# On some boxes NO_MMAP is needed, and not so elsewhere.
  		# Try commenting this out if you suspect MMAP is more efficient
@@@ -167,7 -165,6 +167,7 @@@
  	else
  		NO_REGEX = UnfortunatelyYes
  	endif
 +	HAVE_ALLOCA_H = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@@ -242,7 -239,6 +242,7 @@@ ifeq ($(uname_S),AIX
  endif
  ifeq ($(uname_S),GNU)
  	# GNU/Hurd
 +	HAVE_ALLOCA_H = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
@@@ -317,7 -313,6 +317,7 @@@ endi
  ifeq ($(uname_S),Windows)
  	GIT_VERSION := $(GIT_VERSION).MSVC
  	pathsep = ;
 +	HAVE_ALLOCA_H = YesPlease
  	NO_PREAD = YesPlease
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
@@@ -354,6 -349,7 +354,7 @@@
  	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
@@@ -362,17 -358,17 +363,17 @@@
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o
 -	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 -	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
 +	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 +	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
  	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj
  	PTHREAD_LIBS =
  	lib =
  ifndef DEBUG
 -	BASIC_CFLAGS += -GL -Os -MT
 +	BASIC_CFLAGS += -GL -Os -MD
  	BASIC_LDFLAGS += -LTCG
  	AR += -LTCG
  else
 -	BASIC_CFLAGS += -Zi -MTd
 +	BASIC_CFLAGS += -Zi -MDd
  endif
  	X = .exe
  endif
@@@ -470,7 -466,6 +471,7 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	pathsep = ;
 +	HAVE_ALLOCA_H = YesPlease
  	NO_PREAD = YesPlease
  	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
@@@ -503,6 -498,7 +504,7 @@@
  	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 \