From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Jun 2005 19:16:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~9287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0c3832890dad9977f12eacd1beafb9c50dd7a12;p=emacs.git

*** empty log message ***
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5061cec0d8f..cfc93422a69 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* inc/sys/socket.h: Change arg 4 of sys_setsockopt to
+	`const void *', for consistency with Posix.
+
 2005-06-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* inc/pwd.h (getpwnam, getpwuid): Add prototypes.
diff --git a/src/ChangeLog b/src/ChangeLog
index 12fc70289aa..7ddc5911729 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32.c (sys_setsockopt): Change arg 4 to `const void *'.  In the
+	call to pfn_setsockopt, cast optval to `const char *'.
+
 2005-06-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32.c (gettimeofday): Use struct _timeb, not struct timeb.