Skip to content

Commit 70542df

Browse files
committed
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()
2 parents 6d3df8e + 22c3634 commit 70542df

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

config.mak.uname

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ ifeq ($(uname_S),Windows)
394394
CFLAGS =
395395
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
396396
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
397+
compat/win32/path-utils.o \
397398
compat/win32/pthread.o compat/win32/syslog.o \
398399
compat/win32/trace2_win32_process_info.o \
399400
compat/win32/dirent.o

git-compat-util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
#include "compat/win32/path-utils.h"
201201
#include "compat/mingw.h"
202202
#elif defined(_MSC_VER)
203+
#include "compat/win32/path-utils.h"
203204
#include "compat/msvc.h"
204205
#else
205206
#include <sys/utsname.h>

0 commit comments

Comments
 (0)