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 3be1c235aaa3f4b8d9c074239f00487a1cf7df9a..81604de7f92469c07db648b765a35ec180b82539 100644 (file)
--- 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