[Emacs-diffs] master 57e6c66 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Martin Rudalics]

branch: master
commit 57e6c66dfb179375d323e1ece9099255f53e9cfb
Merge: bb0f925 25159d8
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 admin/CPP-DEFINES |    1 -
 configure.ac      |    2 +-
 src/conf_post.h   |    2 +-
 src/process.c     |    7 ++++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index d9df152..c7ec8ce 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -156,7 +156,6 @@ HAVE_GETLOADAVG
 HAVE_GETOPT_H
 HAVE_GETOPT_LONG_ONLY
 HAVE_GETPAGESIZE
-HAVE_GETPEERNAME
 HAVE_GETPT
 HAVE_GETPWENT
 HAVE_GETRLIMIT
diff --git a/configure.ac b/configure.ac
index a367582..069a726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3848,7 +3848,7 @@ lrand48 random rint \
 select getpagesize setlocale newlocale \
 getrlimit setrlimit shutdown \
 pthread_sigmask strsignal setitimer \
-sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
+sendto recvfrom getsockname getifaddrs freeifaddrs \
 gai_strerror sync \
 getpwent endpwent getgrent endgrent \
 cfmakeraw cfsetspeed copysign __executable_start log2)
diff --git a/src/conf_post.h b/src/conf_post.h
index 1dd915b..6f48fd6 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 5e06ccc..4d287d8 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);