aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2002-03-20 20:41:49 +0000
committerJason Rumney2002-03-20 20:41:49 +0000
commitf37577f922cc1da781f1b89778704741b89f8f6a (patch)
tree5f93cd491b139b4f2223b7d254a42709662d1560 /src
parent962955c57422af811b70efda580a4236c72e4056 (diff)
downloademacs-f37577f922cc1da781f1b89778704741b89f8f6a.tar.gz
emacs-f37577f922cc1da781f1b89778704741b89f8f6a.zip
(LIBS): Remove $(WSOCK32).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog14
-rw-r--r--src/makefile.w32-in1
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e8dfcc455f1..c9e8f58c4ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
12002-03-20 Jason Rumney <jasonr@gnu.org>
2
3 * w32.c (init_winsock): Dynamically load new server and UDP
4 socket functions.
5 (socket_to_fd): New function.
6 (sys_socket): Use it.
7 (sys_setsockopt, sys_listen, sys_getsockname, sys_accept)
8 (sys_recvfrom, sys_sendto): New wrapper functions.
9
10 * process.c (QCfamily, QCfilter): Remove duplicate declaration
11 and initialization.
12
13 * makefile.w32-in (LIBS): Remove $(WSOCK32).
14
12002-03-20 Eli Zaretskii <eliz@is.elta.co.il> 152002-03-20 Eli Zaretskii <eliz@is.elta.co.il>
2 16
3 * process.c (conv_sockaddr_to_lisp, conv_lisp_to_sockaddr): Don't 17 * process.c (conv_sockaddr_to_lisp, conv_lisp_to_sockaddr): Don't
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 10ab92dffa3..b9b1b2a85ab 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -137,7 +137,6 @@ LIBS = $(TLIB0) \
137 $(GDI32) \ 137 $(GDI32) \
138 $(COMDLG32) \ 138 $(COMDLG32) \
139 $(USER32) \ 139 $(USER32) \
140 $(WSOCK32) \
141 $(MPR) \ 140 $(MPR) \
142 $(SHELL32) \ 141 $(SHELL32) \
143 $(libc) 142 $(libc)