ruby-changes:57611
From: Kazuhiro <ko1@a...>
Date: Fri, 6 Sep 2019 17:49:18 +0900 (JST)
Subject: [ruby-changes:57611] 99bfa6c165 (master): Try to fix compile error on win32
https://git.ruby-lang.org/ruby.git/commit/?id=99bfa6c165 From 99bfa6c16562f7af7fb6daf3cf89680ef30d4163 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA <zn@m...> Date: Fri, 6 Sep 2019 17:47:24 +0900 Subject: Try to fix compile error on win32 https://github.com/ruby/ruby/runs/213995386#step:7:810 ``` cxxanyargs.cpp C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\ucrt\corecrt_malloc.h(54): error C2485: '__restrict': unrecognized extended attribute ``` diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a990a55..13463d3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -861,11 +861,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L861 #define RUBY_LONGJMP(env,val) longjmp(env,val) #define RUBY_JMP_BUF jmp_buf #define inline __inline +#ifndef __cplusplus !if $(MSC_VER) >= 1800 #define restrict __restrict !else #define restrict /* not supported */ !endif +#endif #define NEED_IO_SEEK_BETWEEN_RW 1 !if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" #define STACK_GROW_DIRECTION -1 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/