From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2010 05:49:52 +0000 (-0800)
Subject: Merge branch 'ef/win32-dirent'
X-Git-Tag: v1.7.4-rc0~58
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e86274cd4e544628d5f6e327eb62094051e7948;p=git.git

Merge branch 'ef/win32-dirent'

* ef/win32-dirent:
  win32: use our own dirent.h
  msvc: opendir: handle paths ending with a slash
  win32: dirent: handle errors
  msvc: opendir: do not start the search
  msvc: opendir: allocate enough memory
  msvc: opendir: fix malloc-failure

Conflicts:
	Makefile
---

1e86274cd4e544628d5f6e327eb62094051e7948
diff --cc Makefile
index fd0053fa2,5bc9b19c5..6439c7bd3
--- a/Makefile
+++ b/Makefile
@@@ -1096,8 -1085,10 +1097,10 @@@ ifeq ($(uname_S),Windows
  	AR = compat/vcbuild/scripts/lib.pl
  	CFLAGS =
  	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
- 	COMPAT_OBJS = compat/msvc.o compat/winansi.o compat/win32/pthread.o compat/win32/syslog.o compat/win32/sys/poll.o
 -	COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o \
++	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
+ 		compat/win32/pthread.o compat/win32/syslog.o \
+ 		compat/win32/sys/poll.o compat/win32/dirent.o
 -	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 +	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
  	EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
  	PTHREAD_LIBS =
@@@ -1165,11 -1136,11 +1168,11 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_INET_PTON = YesPlease
  	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
 -	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
 +	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 -	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
 +	COMPAT_OBJS += compat/mingw.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
- 		compat/win32/sys/poll.o
+ 		compat/win32/sys/poll.o compat/win32/dirent.o
  	EXTLIBS += -lws2_32
  	PTHREAD_LIBS =
  	X = .exe