Skip to content

Commit a16bac3

Browse files
mhagandermhagander
committed
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
1 parent f162fb7 commit a16bac3

File tree

8 files changed

+11
-17
lines changed

8 files changed

+11
-17
lines changed

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7659,7 +7659,7 @@ return socket ();
76597659
return 0;
76607660
}
76617661
_ACEOF
7662-
for ac_lib in '' socket wsock32; do
7662+
for ac_lib in '' socket ws2_32; do
76637663
if test -z "$ac_lib"; then
76647664
ac_res="none required"
76657665
else

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ fi
891891
AC_CHECK_LIB(m, main)
892892
AC_SEARCH_LIBS(setproctitle, util)
893893
AC_SEARCH_LIBS(dlopen, dl)
894-
AC_SEARCH_LIBS(socket, [socket wsock32])
894+
AC_SEARCH_LIBS(socket, [socket ws2_32])
895895
AC_SEARCH_LIBS(shl_load, dld)
896896
# We only use libld in port/dynloader/aix.c
897897
case $host_os in

‎contrib/pgcrypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SHLIB_LINK += $(filter -lcrypto -lz, $(LIBS))
5555
ifeq ($(PORTNAME), win32)
5656
SHLIB_LINK += $(filter -leay32, $(LIBS))
5757
# those must be at the end
58-
SHLIB_LINK += -lwsock32 -lws2_32
58+
SHLIB_LINK += -lws2_32
5959
endif
6060

6161
rijndael.o: rijndael.tbl

‎src/interfaces/libpq/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ else
7070
SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE)
7171
endif
7272
ifeq ($(PORTNAME), win32)
73-
SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
73+
SHLIB_LINK += -lshfolder -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
7474
endif
7575

7676
SHLIB_EXPORTS = exports.txt

‎src/interfaces/libpq/win32.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ struct MessageDLL
247247
{
248248
"winsock.dll", 0, 0
249249
},
250-
{
251-
"wsock32.dll", 0, 0
252-
},
253250
{
254251
"ws2_32.dll", 0, 0
255252
},

‎src/interfaces/libpq/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ CPP_SBRS=.
208208
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
209209

210210
LINK32=link.exe
211-
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
211+
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
212212
/nologo /subsystem:windows /dll $(LOPT) /incremental:no \
213213
/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
214214
/out:"$(OUTDIR)\$(OUTFILENAME).dll"\

‎src/test/thread/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ to test your system however, you can do so as follows:
4040
-D_POSIX_PTHREAD_SEMANTICS \
4141
-I../../../src/include/port/win32 \
4242
thread_test.c \
43-
-lwsock32 \
43+
-lws2_32 \
4444
-lpthreadgc2
4545

4646
3) Run thread_test.exe. You should see output like:

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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'] };
4848
my $contrib_extraincludes =
4949
{ 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
5050
my $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

306304
my $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

351349
my $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

369366
my $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');
511508
my $mf = Project::read_file('contrib/pgcrypto/Makefile');
512509
GenerateContribSqlFiles('pgcrypto', $mf);
513510

0 commit comments

Comments
 (0)