From: Andres Freund <andres@anarazel.de>
Date: Thu, 12 Oct 2017 02:06:29 +0000 (-0700)
Subject: Temporary attempt at a workaround for further MSVC restrict build failures.
X-Git-Tag: REL_11_BETA1~1402
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36b4b91ba078;p=thirdparty%2Fpostgresql.git

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.
---

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 <stdlib.h>
 #define restrict __restrict
 #else
 #define restrict