@@ -44,7 +44,7 @@ my @contrib_uselibpgcommon = (
4444' pg_test_fsync' ,' pg_test_timing' ,
4545' pg_upgrade' ,' pg_xlogdump' ,
4646' vacuumlo' );
47- my $contrib_extralibs = {' pgbench' => [' wsock32 .lib' ] };
47+ my $contrib_extralibs = {' pgbench' => [' ws2_32 .lib' ] };
4848my $contrib_extraincludes =
4949 {' tsearch2' => [' contrib/tsearch2' ],' dblink' => [' src/backend' ] };
5050my $contrib_extrasource = {
@@ -113,9 +113,8 @@ sub mkvcbuild
113113$postgres -> AddFiles(' src\backend\replication' ,' repl_scanner.l' ,
114114' repl_gram.y' );
115115$postgres -> AddDefine(' BUILDING_DLL' );
116- $postgres -> AddLibrary(' wsock32.lib' );
117- $postgres -> AddLibrary(' ws2_32.lib' );
118116$postgres -> AddLibrary(' secur32.lib' );
117+ $postgres -> AddLibrary(' ws2_32.lib' );
119118$postgres -> AddLibrary(' wldap32.lib' )if ($solution -> {options }-> {ldap });
120119$postgres -> FullExportDLL(' postgres.lib' );
121120
@@ -270,7 +269,6 @@ sub mkvcbuild
270269$libpq -> AddDefine(' FRONTEND' );
271270$libpq -> AddDefine(' UNSAFE_STAT_OK' );
272271$libpq -> AddIncludeDir(' src\port' );
273- $libpq -> AddLibrary(' wsock32.lib' );
274272$libpq -> AddLibrary(' secur32.lib' );
275273$libpq -> AddLibrary(' ws2_32.lib' );
276274$libpq -> AddLibrary(' wldap32.lib' )if ($solution -> {options }-> {ldap });
@@ -300,7 +298,7 @@ sub mkvcbuild
300298$libecpg -> AddIncludeDir(' src\interfaces\libpq' );
301299$libecpg -> AddIncludeDir(' src\port' );
302300$libecpg -> UseDef(' src\interfaces\ecpg\ecpglib\ecpglib.def' );
303- $libecpg -> AddLibrary(' wsock32 .lib' );
301+ $libecpg -> AddLibrary(' ws2_32 .lib' );
304302$libecpg -> AddReference($libpq ,$pgtypes ,$libpgport );
305303
306304my $libecpgcompat =$solution -> AddProject(
@@ -345,7 +343,7 @@ sub mkvcbuild
345343$isolation_tester -> AddIncludeDir(' src\interfaces\libpq' );
346344$isolation_tester -> AddDefine(' HOST_TUPLE="i686-pc-win32vc"' );
347345$isolation_tester -> AddDefine(' FRONTEND' );
348- $isolation_tester -> AddLibrary(' wsock32 .lib' );
346+ $isolation_tester -> AddLibrary(' ws2_32 .lib' );
349347$isolation_tester -> AddReference($libpq ,$libpgcommon ,$libpgport );
350348
351349my $pgregress_isolation =
@@ -363,7 +361,6 @@ sub mkvcbuild
363361$initdb -> AddIncludeDir(' src\interfaces\libpq' );
364362$initdb -> AddIncludeDir(' src\timezone' );
365363$initdb -> AddDefine(' FRONTEND' );
366- $initdb -> AddLibrary(' wsock32.lib' );
367364$initdb -> AddLibrary(' ws2_32.lib' );
368365
369366my $pgbasebackup = AddSimpleFrontend(' pg_basebackup' , 1);
@@ -507,7 +504,7 @@ sub mkvcbuild
507504' pgp-mpi-internal.c' ,' imath.c' );
508505}
509506$pgcrypto -> AddReference($postgres );
510- $pgcrypto -> AddLibrary(' wsock32 .lib' );
507+ $pgcrypto -> AddLibrary(' ws2_32 .lib' );
511508my $mf = Project::read_file(' contrib/pgcrypto/Makefile' );
512509GenerateContribSqlFiles(' pgcrypto' ,$mf );
513510