From 36b4b91ba07843406d5a30106facb59d8275c6de Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 11 Oct 2017 19:06:29 -0700 Subject: [PATCH] Temporary attempt at a workaround for further MSVC restrict build failures. It appears some versions of msvc use __declspec(restrict) in stdlib.h and subsidiary headers. Including those after defining 'restrict' to '__restrict' doesn't work. Try to get the buildfarm green to see whether there's further problems, by including stdlib.h just before said define. --- src/include/pg_config.h.win32 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 3be1c235aaa..81604de7f92 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -687,6 +687,11 @@ /* Visual Studio 2008 and upwards */ #if (_MSC_VER >= 1500) /* works for C and C++ in msvc */ +/* + * Temporary attempt at a workaround for stdlib.h's use of + * declspec(restrict), conflicting with below define. + */ +#include #define restrict __restrict #else #define restrict -- 2.39.5