Commit22867ab

committed

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

used when building addons.Dave Page

1 parent4192f2d commit22867abCopy full SHA for 22867ab

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.81 2007/11/24 01:55:26 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.82 2007/12/11 14:34:43 mha Exp $ */`
`2`	`2`
`3`	`3`	`#if defined(_MSC_VER)\|\| defined(__BORLANDC__)`
`4`	`4`	`#defineWIN32_ONLY_COMPILER`
`@@ -45,6 +45,17 @@`
`45`	`45`
`46`	`46`	`#defineUSES_WINSOCK`
`47`	`47`
	`48`	`+/*`
	`49`	`+ * Ensure that anyone building an extension is using a 32 bit time_t.`
	`50`	`+ * On Mingw/Msys, that should always be the case, but MSVC++ defaults`
	`51`	`+ * to 64 bits. We set that for our own build in the project files`
	`52`	`+ */`
	`53`	`+#ifdefWIN32_ONLY_COMPILER`
	`54`	`+#ifndef_USE_32BIT_TIME_T`
	`55`	`+#error "Postgres uses 32 bit time_t - add #define _USE_32BIT_TIME_T on Windows"`
	`56`	`+#endif`
	`57`	`+#endif`
	`58`	`+`
`48`	`59`	`/* defines for dynamic linking on Win32 platform */`
`49`	`60`	`#if defined(WIN32)\|\| defined(__CYGWIN__)`
`50`	`61`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Project;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ project file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.14 2007/08/21 15:10:41 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.15 2007/12/11 14:34:43 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -489,7 +489,7 @@ sub WriteConfiguration`
`489`	`489`	`ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">`
`490`	`490`	`<Tool Name="VCCLCompilerTool" Optimization="$p->{opt}"`
`491`	`491`	`AdditionalIncludeDirectories="$self->{prefixincludes}src/include;src/include/port/win32;src/include/port/win32_msvc;$self->{includes}"`
`492`		`-PreprocessorDefinitions="WIN32;_WINDOWS;__WINDOWS__;__WIN32__;EXEC_BACKEND;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE$self->{defines}$p->{defs}"`
	`492`	`+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}"`
`493`	`493`	`StringPooling="$p->{strpool}"`
`494`	`494`	`RuntimeLibrary="$p->{runtime}" DisableSpecificWarnings="$self->{disablewarnings}"`
`495`	`495`	`EOF`

Comments

(0)