In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/fe7ba591228c20c0840941f6994ce3055969d50f?hp=8ee6927b530890c4b1410d310f8e1b409a1f639c>
- Log ----------------------------------------------------------------- commit fe7ba591228c20c0840941f6994ce3055969d50f Author: Steve Hay <[email protected]> Date: Wed Jun 7 08:39:20 2017 +0100 Fix dmake build breakage when using Visual C++ This was introduced by commit 1f664ef531. dmake with VC++ is not a common combination, but I should have tested it :-( ----------------------------------------------------------------------- Summary of changes: win32/makefile.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win32/makefile.mk b/win32/makefile.mk index 88d197ec34..7af03b05f0 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -669,7 +669,7 @@ DEFINES += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE # Likewise for deprecated Winsock APIs in VC++ 14.0 for now. .IF "$(CCTYPE)" == "MSVC140" || "$(CCTYPE)" == "MSVC140FREE" -DEFINES = $(DEFINES) -D_WINSOCK_DEPRECATED_NO_WARNINGS +DEFINES += -D_WINSOCK_DEPRECATED_NO_WARNINGS .ENDIF # In VS 2005 (VC++ 8.0) Microsoft changes time_t from 32-bit to @@ -1246,10 +1246,10 @@ $(MINIDIR)\.exists : $(CFGH_TMPL) echo #undef FILE_cnt&& \ echo #undef FILE_base&& \ echo #undef FILE_bufsiz&& \ - echo #define FILE_ptr(fp) PERLIO_FILE_ptr(fp)&& \ - echo #define FILE_cnt(fp) PERLIO_FILE_cnt(fp)&& \ - echo #define FILE_base(fp) PERLIO_FILE_base(fp)&& \ - echo #define FILE_bufsiz(fp) (PERLIO_FILE_cnt(fp) + PERLIO_FILE_ptr(fp) - PERLIO_FILE_base(fp))&& \ + echo #define FILE_ptr^(fp^) PERLIO_FILE_ptr^(fp^)&& \ + echo #define FILE_cnt^(fp^) PERLIO_FILE_cnt^(fp^)&& \ + echo #define FILE_base^(fp^) PERLIO_FILE_base^(fp^)&& \ + echo #define FILE_bufsiz^(fp^) ^(PERLIO_FILE_cnt^(fp^) + PERLIO_FILE_ptr^(fp^) - PERLIO_FILE_base^(fp^)^)&& \ echo #define I_STDBOOL)>> config.h .ENDIF .IF "$(USE_LARGE_FILES)"=="define" -- Perl5 Master Repository
