Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index d9df152bff5a8c916823d2a9400d84b7460c305e..c7ec8ce6fed80eb2768ee4ad5d78c5251462f6a8 100644 (file)
--- 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 a367582f2abeaf41b47bed91799111c02529811a..069a7260e88dd372fce9fbdf852ace225d3bfd36 100644 (file)
--- 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 1dd915b5969810ad738a48026b6ef11d826112e7..6f48fd6d184d610da3e0b657db8b81d2b66230fa 100644 (file)
--- 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 5e06ccccac8a4cf024a3f095447ec610c3179756..4d287d8cc517809291e2bf188f58090c0dd28199 100644 (file)
--- 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);