summaryrefslogtreecommitdiff
path: root/src/backend/port/win32
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2016-04-29 07:59:47 -0400
committerAndrew Dunstan <andrew@dunslane.net>2016-04-29 08:09:07 -0400
commit0fb54de9aa4ffb792ea63af853146021ae501f12 (patch)
tree143d27120773629c601894184c065b1eef12ba9b /src/backend/port/win32
parent59455018a8120bb3c02680b0f9764492c5283d99 (diff)
downloadpostgresql-0fb54de9aa4ffb792ea63af853146021ae501f12.tar.gz
Support building with Visual Studio 2015
Adjust the way we detect the locale. As a result the minumum Windows version supported by VS2015 and later is Windows Vista. Add some tweaks to remove new compiler warnings. Remove documentation references to the now obsolete msysGit. Michael Paquier, somewhat edited by me, reviewed by Christian Ullrich. Backpatch to 9.5
Diffstat (limited to 'src/backend/port/win32')
-rw-r--r--src/backend/port/win32/crashdump.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c
index ec7c325e4e..92e23cbf4b 100644
--- a/src/backend/port/win32/crashdump.c
+++ b/src/backend/port/win32/crashdump.c
@@ -41,7 +41,21 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <string.h>
+/*
+ * Some versions of the MS SDK contain "typedef enum { ... } ;" which the MS
+ * compiler quite sanely complains about. Well done, Microsoft.
+ * This pragma disables the warning just while we include the header.
+ * The pragma is known to work with all (as at the time of writing) supported
+ * versions of MSVC.
+ */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4091)
+#endif
#include <dbghelp.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
/*
* Much of the following code is based on CodeProject and MSDN examples,