Skip to content

Commit 6c00e6b

Browse files
committed
Merge branch 'ss/msvc-path-utils-fix'
This is a necessary fix to allow compiling with MSVC again, backported from upstream git.git's `pu` branch thicket.
2 parents d16e36e + 22c3634 commit 6c00e6b

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

config.mak.uname

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ ifeq ($(uname_S),Windows)
428428
CFLAGS =
429429
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
430430
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
431+
compat/win32/path-utils.o \
431432
compat/win32/pthread.o compat/win32/syslog.o \
432433
compat/win32/trace2_win32_process_info.o \
433434
compat/win32/dirent.o compat/win32/fscache.o

git-compat-util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
#include "compat/mingw.h"
211211
#include "compat/win32/fscache.h"
212212
#elif defined(_MSC_VER)
213+
#include "compat/win32/path-utils.h"
213214
#include "compat/msvc.h"
214215
#include "compat/win32/fscache.h"
215216
#else

0 commit comments

Comments
 (0)