Skip to content

Commit dbd7577

Browse files
committed
update VS project
1 parent 351b3dd commit dbd7577

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

msvs/template.pg_probackup.vcxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,26 @@
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<LinkIncremental>true</LinkIncremental>
7171
<IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
72-
<LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
72+
<LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
73+
<ExcludePath />
7374
</PropertyGroup>
7475
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7576
<LinkIncremental>true</LinkIncremental>
7677
<IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
77-
<LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
78+
<LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
79+
<ExcludePath />
7880
</PropertyGroup>
7981
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8082
<LinkIncremental>false</LinkIncremental>
8183
<IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
82-
<LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
84+
<LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
85+
<ExcludePath />
8386
</PropertyGroup>
8487
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8588
<LinkIncremental>false</LinkIncremental>
8689
<IncludePath>../;@PGSRC@\include;@PGSRC@\bin\pg_basebackup;@PGSRC@\bin\pg_rewind;@PGSRC@\include\port\win32_msvc;@PGSRC@\interfaces\libpq;@PGSRC@\include\port\win32;@PGSRC@\port;@ADDINCLUDE@;@PGSRC@;$(IncludePath)</IncludePath>
87-
<LibraryPath>@PGROOT@\lib;@$(LibraryPath)</LibraryPath>
90+
<LibraryPath>@PGROOT@\lib;$(LibraryPath)</LibraryPath>
91+
<ExcludePath />
8892
</PropertyGroup>
8993
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9094
<ClCompile>
@@ -134,6 +138,7 @@
134138
<EnableCOMDATFolding>true</EnableCOMDATFolding>
135139
<OptimizeReferences>true</OptimizeReferences>
136140
<AdditionalDependencies>@ADDLIBS32@;libpgfeutils.lib;libpgcommon.lib;libpgport.lib;libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
141+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137142
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
138143
</Link>
139144
</ItemDefinitionGroup>
@@ -154,6 +159,7 @@
154159
<EnableCOMDATFolding>true</EnableCOMDATFolding>
155160
<OptimizeReferences>true</OptimizeReferences>
156161
<AdditionalDependencies>@ADDLIBS@;libpgfeutils.lib;libpgcommon.lib;libpgport.lib;libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
162+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157163
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
158164
</Link>
159165
</ItemDefinitionGroup>

src/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ push_wal_file(const char *from_path, const char *to_path, bool is_compress,
853853
bool overwrite)
854854
{
855855
FILE *in = NULL;
856-
FILE *out;
856+
FILE *out=NULL;
857857
char buf[XLOG_BLCKSZ];
858858
const char *to_path_p = to_path;
859859
char to_path_temp[MAXPGPATH];

src/utils/logger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ elog_internal(int elevel, bool file_only, const char *fmt, va_list args)
143143
bool write_to_file,
144144
write_to_error_log,
145145
write_to_stderr;
146-
va_list error_args,
147-
std_args;
146+
va_list error_args=NULL,
147+
std_args=NULL;
148148
time_t log_time = (time_t) time(NULL);
149149
char strfbuf[128];
150150

0 commit comments

Comments
 (0)