kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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()
maint
Junio C Hamano 2019-05-09 00:37:26 +09:00
parent 6d3df8ef01 22c3634c0f
commit 70542df566
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.mak.uname
View File

@ -394,6 +394,7 @@ ifeq ($(uname_S),Windows)
CFLAGS = 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 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_OBJS = compat/msvc.o compat/winansi.o \
compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/trace2_win32_process_info.o \ compat/win32/trace2_win32_process_info.o \
compat/win32/dirent.o compat/win32/dirent.o

1
git-compat-util.h
View File

@ -200,6 +200,7 @@
#include "compat/win32/path-utils.h" #include "compat/win32/path-utils.h"
#include "compat/mingw.h" #include "compat/mingw.h"
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#include "compat/win32/path-utils.h"
#include "compat/msvc.h" #include "compat/msvc.h"
#else #else
#include <sys/utsname.h> #include <sys/utsname.h>