Merge branch 'ss/msvc-path-utils-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:26 +0000 (00:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:26 +0000 (00:37 +0900)
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()

1  2 
config.mak.uname
git-compat-util.h
index 3605fead53a79d4e37c92a026701b89fcce501c5,b7b8a716da11f2eaf3c7e3ccdc4c413e7b561edd..d56613a1397dc400c3903299816fc2aea345e9a0
@@@ -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
Simple merge