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: https://www.git.lorimer.id.au/gitweb.git/diff_plain/70542df56618f2766064384f7741c7e25bac1cfd?hp=6d3df8ef01b95539539cd5b22304eff27ea1322b

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()
---

diff --git a/config.mak.uname b/config.mak.uname
index 3605fead53..d56613a139 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -394,6 +394,7 @@ 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
diff --git a/git-compat-util.h b/git-compat-util.h
index 31b47932bd..4386b3e1c8 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -200,6 +200,7 @@
 #include "compat/win32/path-utils.h"
 #include "compat/mingw.h"
 #elif defined(_MSC_VER)
+#include "compat/win32/path-utils.h"
 #include "compat/msvc.h"
 #else
 #include <sys/utsname.h>