Use _USE_32BIT_TIME_T when building with MSVC. Also, enforce that it's

used when building addons.

Dave Page

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index d232b8c37651e1a37b25968660e0e20301beb311..540ffc646631a71943d8b3bdc8b58f6739166ff9 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -45,6 +45,17 @@
 
 #define USES_WINSOCK
 
+/*
+ * Ensure that anyone building an extension is using a 32 bit time_t.
+ * On Mingw/Msys, that should always be the case, but MSVC++ defaults
+ * to 64 bits. We set that for our own build in the project files
+ */
+#ifdef WIN32_ONLY_COMPILER
+#ifndef _USE_32BIT_TIME_T
+#error "Postgres uses 32 bit time_t - add #define _USE_32BIT_TIME_T on Windows"
+#endif
+#endif
+
 /* defines for dynamic linking on Win32 platform */
 #if defined(WIN32) || defined(__CYGWIN__)
 

diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index a81c3a27a3717c62f4dd2c8c2da71b7783a6b20c..e39505884bff1ec0f1c7d72a2890cac9aef0d36c 100644 (file)
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -489,7 +489,7 @@ sub WriteConfiguration
        ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">
        <Tool Name="VCCLCompilerTool" Optimization="$p->{opt}"
                AdditionalIncludeDirectories="$self->{prefixincludes}src/include;src/include/port/win32;src/include/port/win32_msvc;$self->{includes}"
-               PreprocessorDefinitions="WIN32;_WINDOWS;__WINDOWS__;__WIN32__;EXEC_BACKEND;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE$self->{defines}$p->{defs}"
+               PreprocessorDefinitions="WIN32;_WINDOWS;__WINDOWS__;__WIN32__;EXEC_BACKEND;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T$self->{defines}$p->{defs}"
                StringPooling="$p->{strpool}"
                RuntimeLibrary="$p->{runtime}" DisableSpecificWarnings="$self->{disablewarnings}"
 EOF