diff --git a/ChangeLog b/ChangeLog
index 6cd2fe53334..53126fa050a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-02  Dave Love  <fx@gnu.org>
+
+	* configure.in: Check for gai_strerror.
+
 2000-10-01  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.in (install-arch-indep): Update list of installed info
diff --git a/configure b/configure
index af9deb458fd..87975dfcc6d 100755
--- a/configure
+++ b/configure
@@ -3504,7 +3504,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -5652,7 +5652,7 @@ else
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-char *p = alloca(2 * sizeof(int));
+void *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -6166,7 +6166,7 @@ rename closedir mkdir rmdir sysinfo \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
-__fpending mblen mbrlen strsignal setitimer ualarm index rindex
+__fpending mblen mbrlen strsignal setitimer ualarm index rindex gai_strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:6173: checking for $ac_func" >&5
diff --git a/src/ChangeLog b/src/ChangeLog
index c890250eb49..70e59c36351 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-02  Dave Love  <fx@gnu.org>
+
+	* config.in (HAVE_GAI_STRERROR): Add undef.
+
+	* process.c (Fopen_network_stream): Use it.
+
+	* m/alpha.h (NO_REMAP): Don't define.
+
 2000-10-02  Gerd Moellmann  <gerd@gnu.org>
 
 	* lisp.h (wrong_type_argument): Remove NO_RETURN, the function can