diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:16:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:16:20 +0000 |
| commit | 323bcca5249c707b68d9f6d921d86fd750bcf33e (patch) | |
| tree | 07b4722c510482f5ee2fdcc3d381fc77747b0178 /src/tools/msvc | |
| parent | Adding debian version 16.2-2. (diff) | |
| download | postgresql-16-323bcca5249c707b68d9f6d921d86fd750bcf33e.tar.xz postgresql-16-323bcca5249c707b68d9f6d921d86fd750bcf33e.zip | |
Merging upstream version 16.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tools/msvc')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 1 | ||||
| -rw-r--r-- | src/tools/msvc/ecpg_regression.proj | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 9e05eb9..6a79a0e 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -113,6 +113,7 @@ sub mkvcbuild win32env.c win32error.c win32fdatasync.c win32fseek.c + win32gai_strerror.c win32getrusage.c win32gettimeofday.c win32link.c diff --git a/src/tools/msvc/ecpg_regression.proj b/src/tools/msvc/ecpg_regression.proj index ec2760b..8691b04 100644 --- a/src/tools/msvc/ecpg_regression.proj +++ b/src/tools/msvc/ecpg_regression.proj @@ -15,7 +15,7 @@ </PropertyGroup> <ItemGroup> - <Pgc Include="$(TESTDIR)\**\*.pgc" Exclude="$(TESTDIR)\performance\perftest.pgc"/> + <Pgc Include="$(TESTDIR)\**\*.pgc" Exclude="$(TESTDIR)\performance\perftest.pgc;$(TESTDIR)\sql\define_prelim.pgc"/> </ItemGroup> <ItemGroup> @@ -51,9 +51,15 @@ <CreateProperty Value="-i" Condition="'%(Pgc.FileName)'=='strings'"> <Output TaskParameter="Value" PropertyName="ECPGPARAM" /> </CreateProperty> + <CreateProperty Value="-DCMDLINESYM=123" Condition="'%(Pgc.FileName)'=='define'"> + <Output TaskParameter="Value" PropertyName="ECPGPARAM" /> + </CreateProperty> + <CreateProperty Value="define_prelim.pgc" Condition="'%(Pgc.FileName)'=='define'"> + <Output TaskParameter="Value" PropertyName="ECPGEXTRA" /> + </CreateProperty> <!-- Run ECPG and the Visual C++ compiler on the files. Don't bother with dependency check between the steps --> - <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c %(Pgc.Filename).pgc" /> + <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c $(ECPGEXTRA) %(Pgc.Filename).pgc" /> <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="cl /nologo %(Pgc.FileName).c /TC /MD$(DEBUGLIB) /DENABLE_THREAD_SAFETY /DWIN32 /I. /I..\..\include /I..\..\..\libpq /I..\..\..\..\include /link /defaultlib:$(OUTDIR)libecpg\libecpg.lib /defaultlib:$(OUTDIR)libecpg_compat\libecpg_compat.lib /defaultlib:$(OUTDIR)libpgtypes\libpgtypes.lib" /> </Target> |