From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:26 +0000 (+0900)
Subject: Merge branch 'ss/msvc-path-utils-fix'
X-Git-Tag: v2.22.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70542df56618f2766064384f7741c7e25bac1cfd;p=thirdparty%2Fgit.git

Merge branch 'ss/msvc-path-utils-fix'

An earlier update for MinGW and Cygwin accidentally broke MSVC build,
which has been fixed.

* ss/msvc-path-utils-fix:
  MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()
---

70542df56618f2766064384f7741c7e25bac1cfd
diff --cc config.mak.uname
index 3605fead53,b7b8a716da..d56613a139
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -394,8 -392,8 +394,9 @@@ ifeq ($(uname_S),Windows
  	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/path-utils.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/dirent.o
  	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