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 3605fead53a79d4e37c92a026701b89fcce501c5..d56613a1397dc400c3903299816fc2aea345e9a0 100644 (file)
--- 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 31b47932bd5144f306a9aa1b122fdf3cb0886284..4386b3e1c874b587d1bbc0e99394d6c9c016830e 100644 (file)
--- 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>