Commit a16bac36 authored by Magnus Hagander's avatar Magnus Hagander

Remove dependency on wsock32.lib in favor of ws2_32

ws2_32 is the new version of the library that should be used, as
it contains the require functionality from wsock32 as well as some
more (which is why some binaries were already using ws2_32).

Michael Paquier, reviewed by MauMau
parent f162fb75
...@@ -7659,7 +7659,7 @@ return socket (); ...@@ -7659,7 +7659,7 @@ return socket ();
return 0; return 0;
} }
_ACEOF _ACEOF
for ac_lib in '' socket wsock32; do for ac_lib in '' socket ws2_32; do
if test -z "$ac_lib"; then if test -z "$ac_lib"; then
ac_res="none required" ac_res="none required"
else else
......
...@@ -891,7 +891,7 @@ fi ...@@ -891,7 +891,7 @@ fi
AC_CHECK_LIB(m, main) AC_CHECK_LIB(m, main)
AC_SEARCH_LIBS(setproctitle, util) AC_SEARCH_LIBS(setproctitle, util)
AC_SEARCH_LIBS(dlopen, dl) AC_SEARCH_LIBS(dlopen, dl)
AC_SEARCH_LIBS(socket, [socket wsock32]) AC_SEARCH_LIBS(socket, [socket ws2_32])
AC_SEARCH_LIBS(shl_load, dld) AC_SEARCH_LIBS(shl_load, dld)
# We only use libld in port/dynloader/aix.c # We only use libld in port/dynloader/aix.c
case $host_os in case $host_os in
......
...@@ -55,7 +55,7 @@ SHLIB_LINK += $(filter -lcrypto -lz, $(LIBS)) ...@@ -55,7 +55,7 @@ SHLIB_LINK += $(filter -lcrypto -lz, $(LIBS))
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
SHLIB_LINK += $(filter -leay32, $(LIBS)) SHLIB_LINK += $(filter -leay32, $(LIBS))
# those must be at the end # those must be at the end
SHLIB_LINK += -lwsock32 -lws2_32 SHLIB_LINK += -lws2_32
endif endif
rijndael.o: rijndael.tbl rijndael.o: rijndael.tbl
......
...@@ -70,7 +70,7 @@ else ...@@ -70,7 +70,7 @@ else
SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE) SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE)
endif endif
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS)) SHLIB_LINK += -lshfolder -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
endif endif
SHLIB_EXPORTS = exports.txt SHLIB_EXPORTS = exports.txt
......
...@@ -247,9 +247,6 @@ struct MessageDLL ...@@ -247,9 +247,6 @@ struct MessageDLL
{ {
"winsock.dll", 0, 0 "winsock.dll", 0, 0
}, },
{
"wsock32.dll", 0, 0
},
{ {
"ws2_32.dll", 0, 0 "ws2_32.dll", 0, 0
}, },
......
...@@ -208,7 +208,7 @@ CPP_SBRS=. ...@@ -208,7 +208,7 @@ CPP_SBRS=.
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
LINK32=link.exe LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \ LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
/nologo /subsystem:windows /dll $(LOPT) /incremental:no \ /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
/out:"$(OUTDIR)\$(OUTFILENAME).dll"\ /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
......
...@@ -40,7 +40,7 @@ to test your system however, you can do so as follows: ...@@ -40,7 +40,7 @@ to test your system however, you can do so as follows:
-D_POSIX_PTHREAD_SEMANTICS \ -D_POSIX_PTHREAD_SEMANTICS \
-I../../../src/include/port/win32 \ -I../../../src/include/port/win32 \
thread_test.c \ thread_test.c \
-lwsock32 \ -lws2_32 \
-lpthreadgc2 -lpthreadgc2
3) Run thread_test.exe. You should see output like: 3) Run thread_test.exe. You should see output like:
......
...@@ -44,7 +44,7 @@ my @contrib_uselibpgcommon = ( ...@@ -44,7 +44,7 @@ my @contrib_uselibpgcommon = (
'pg_test_fsync', 'pg_test_timing', 'pg_test_fsync', 'pg_test_timing',
'pg_upgrade', 'pg_xlogdump', 'pg_upgrade', 'pg_xlogdump',
'vacuumlo'); 'vacuumlo');
my $contrib_extralibs = { 'pgbench' => ['wsock32.lib'] }; my $contrib_extralibs = { 'pgbench' => ['ws2_32.lib'] };
my $contrib_extraincludes = my $contrib_extraincludes =
{ 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] }; { 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
my $contrib_extrasource = { my $contrib_extrasource = {
...@@ -113,9 +113,8 @@ sub mkvcbuild ...@@ -113,9 +113,8 @@ sub mkvcbuild
$postgres->AddFiles('src\backend\replication', 'repl_scanner.l', $postgres->AddFiles('src\backend\replication', 'repl_scanner.l',
'repl_gram.y'); 'repl_gram.y');
$postgres->AddDefine('BUILDING_DLL'); $postgres->AddDefine('BUILDING_DLL');
$postgres->AddLibrary('wsock32.lib');
$postgres->AddLibrary('ws2_32.lib');
$postgres->AddLibrary('secur32.lib'); $postgres->AddLibrary('secur32.lib');
$postgres->AddLibrary('ws2_32.lib');
$postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
$postgres->FullExportDLL('postgres.lib'); $postgres->FullExportDLL('postgres.lib');
...@@ -270,7 +269,6 @@ sub mkvcbuild ...@@ -270,7 +269,6 @@ sub mkvcbuild
$libpq->AddDefine('FRONTEND'); $libpq->AddDefine('FRONTEND');
$libpq->AddDefine('UNSAFE_STAT_OK'); $libpq->AddDefine('UNSAFE_STAT_OK');
$libpq->AddIncludeDir('src\port'); $libpq->AddIncludeDir('src\port');
$libpq->AddLibrary('wsock32.lib');
$libpq->AddLibrary('secur32.lib'); $libpq->AddLibrary('secur32.lib');
$libpq->AddLibrary('ws2_32.lib'); $libpq->AddLibrary('ws2_32.lib');
$libpq->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); $libpq->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
...@@ -300,7 +298,7 @@ sub mkvcbuild ...@@ -300,7 +298,7 @@ sub mkvcbuild
$libecpg->AddIncludeDir('src\interfaces\libpq'); $libecpg->AddIncludeDir('src\interfaces\libpq');
$libecpg->AddIncludeDir('src\port'); $libecpg->AddIncludeDir('src\port');
$libecpg->UseDef('src\interfaces\ecpg\ecpglib\ecpglib.def'); $libecpg->UseDef('src\interfaces\ecpg\ecpglib\ecpglib.def');
$libecpg->AddLibrary('wsock32.lib'); $libecpg->AddLibrary('ws2_32.lib');
$libecpg->AddReference($libpq, $pgtypes, $libpgport); $libecpg->AddReference($libpq, $pgtypes, $libpgport);
my $libecpgcompat = $solution->AddProject( my $libecpgcompat = $solution->AddProject(
...@@ -345,7 +343,7 @@ sub mkvcbuild ...@@ -345,7 +343,7 @@ sub mkvcbuild
$isolation_tester->AddIncludeDir('src\interfaces\libpq'); $isolation_tester->AddIncludeDir('src\interfaces\libpq');
$isolation_tester->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $isolation_tester->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
$isolation_tester->AddDefine('FRONTEND'); $isolation_tester->AddDefine('FRONTEND');
$isolation_tester->AddLibrary('wsock32.lib'); $isolation_tester->AddLibrary('ws2_32.lib');
$isolation_tester->AddReference($libpq, $libpgcommon, $libpgport); $isolation_tester->AddReference($libpq, $libpgcommon, $libpgport);
my $pgregress_isolation = my $pgregress_isolation =
...@@ -363,7 +361,6 @@ sub mkvcbuild ...@@ -363,7 +361,6 @@ sub mkvcbuild
$initdb->AddIncludeDir('src\interfaces\libpq'); $initdb->AddIncludeDir('src\interfaces\libpq');
$initdb->AddIncludeDir('src\timezone'); $initdb->AddIncludeDir('src\timezone');
$initdb->AddDefine('FRONTEND'); $initdb->AddDefine('FRONTEND');
$initdb->AddLibrary('wsock32.lib');
$initdb->AddLibrary('ws2_32.lib'); $initdb->AddLibrary('ws2_32.lib');
my $pgbasebackup = AddSimpleFrontend('pg_basebackup', 1); my $pgbasebackup = AddSimpleFrontend('pg_basebackup', 1);
...@@ -507,7 +504,7 @@ sub mkvcbuild ...@@ -507,7 +504,7 @@ sub mkvcbuild
'pgp-mpi-internal.c', 'imath.c'); 'pgp-mpi-internal.c', 'imath.c');
} }
$pgcrypto->AddReference($postgres); $pgcrypto->AddReference($postgres);
$pgcrypto->AddLibrary('wsock32.lib'); $pgcrypto->AddLibrary('ws2_32.lib');
my $mf = Project::read_file('contrib/pgcrypto/Makefile'); my $mf = Project::read_file('contrib/pgcrypto/Makefile');
GenerateContribSqlFiles('pgcrypto', $mf); GenerateContribSqlFiles('pgcrypto', $mf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment