Define WIN32 when _WIN32 is set

_WIN32 is set by the compiler, whereas our code uses WIN32 that is
normally set through our build system. To make it possible to build
extensions out of tree we cannot rely on that, so set the WIN32
symbol explicitly whenever the compiler has set _WIN32.

Not setting this symbol causes double inclusion of pg_config_os.h,
and possibly other errors as well.

Craig Ringer

diff --git a/src/include/c.h b/src/include/c.h
index 4f6ce0c99ae49b8798b7650dbcd0f5ac8529bbf0..774a0a1549765c58e1bbebdcd35c14d9ccbdbca0 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -53,6 +53,15 @@
 #include "pg_config.h"
 #include "pg_config_manual.h"  /* must be after pg_config.h */
 
+/*
+ * We always rely on the WIN32 macro being set by our build system,
+ * but _WIN32 is the compiler pre-defined macro. So make sure we define
+ * WIN32 whenever _WIN32 is set, to facilitate standalone building.
+ */
+#if defined(_WIN32)
+#define WIN32
+#endif
+
 #if !defined(WIN32) && !defined(__CYGWIN__)            /* win32 includes further down */
 #include "pg_config_os.h"              /* must be before any system header files */
 #endif