2 files changed, 5 insertions, 4 deletions

diff --git a/src/conf_post.h b/src/conf_post.h
index 1dd915b5969..6f48fd6d184 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -88,7 +88,7 @@ typedef bool bool_bf;
 
 /* Yield PTR, which must be aligned to ALIGNMENT.  */
 #if ! __has_builtin (__builtin_assume_aligned)
-# define __builtin_assume_aligned(ptr, alignment, ...) ((void *) (ptr))
+# define __builtin_assume_aligned(ptr, ...) ((void *) (ptr))
 #endif
 
 #ifdef DARWIN_OS
diff --git a/src/process.c b/src/process.c
index 5e06ccccac8..4d287d8cc51 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5492,15 +5492,16 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
 
               p = XPROCESS (proc);
 
-#ifdef GNU_LINUX
-              /* getsockopt(,,SO_ERROR,,) is said to hang on some systems.
-                 So only use it on systems where it is known to work.  */
+#ifndef WINDOWSNT
               {
                 socklen_t xlen = sizeof (xerrno);
                 if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen))
                   xerrno = errno;
               }
 #else
+              /* On MS-Windows, getsockopt clears the error for the
+                 entire process, which may not be the right thing; see
+                 w32.c.  Use getpeername instead.  */
               {
                 struct sockaddr pname;
                 socklen_t pnamelen = sizeof (pname);