diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:26 +0900 |
| commit | 70542df56618f2766064384f7741c7e25bac1cfd (patch) | |
| tree | 50b93a32147b59f031cb6284b66154f2ba4a8cde | |
| parent | Merge branch 'jt/clone-server-option' (diff) | |
| parent | MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path() (diff) | |
| download | tgif-70542df56618f2766064384f7741c7e25bac1cfd.tar.xz | |
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()
| -rw-r--r-- | config.mak.uname | 1 | ||||
| -rw-r--r-- | git-compat-util.h | 1 |
2 files changed, 2 insertions, 0 deletions
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> |