# HG changeset patch
# User didierv
# Date 1022665369 0
# Node ID 211050afdc9a77035a5ae746eb82684e5ee7d5be
# Parent  1d8fb2eee1bbf75bf175f5ee6597a65233d14d53
[xemacs-hg @ 2002-05-29 09:42:47 by didierv]
fix shadow declaration

diff -r 1d8fb2eee1bb -r 211050afdc9a src/ChangeLog
--- a/src/ChangeLog	Tue May 28 16:07:03 2002 +0000
+++ b/src/ChangeLog	Wed May 29 09:42:49 2002 +0000
@@ -1,3 +1,9 @@
+2002-05-29  Didier Verna  <didier@xemacs.org>
+
+	* process-unix.c (unix_canonicalize_host_name): change gai_error
+	to gai_err to avoid shadow declaration.
+	* process-unix.c (unix_open_network_stream): ditto.
+
 2002-05-28  Didier Verna  <didier@xemacs.org>
 
 	* emacs.c: comment the inclusion order of syssignal.h and sysproc.h.
@@ -8329,7 +8335,7 @@
 	Fix compile warnings.
 
 	* menubar.c (vars_of_menubar):
-	Provide `menu-accelerator-support' to indicate that we properly
+	Provide `menu-accelerator-support' to indicate that we Properly
 	support %_ in menu specifications, so that package code can
 	conditionalize on this (and remove %_ from menu specifications
 	on older versions).
@@ -12376,7 +12382,7 @@
 
 	* mule-canna.c (CANNA_mode_keys): make static.
 	Use proper prototypes, even for functions of no arguments.
-	Remove external prototype for Fding().
+	RemOve external prototype for Fding().
 
 	* symsinit.h: Add missing prototype for reinit_vars_of_mule_wnn.
 
diff -r 1d8fb2eee1bb -r 211050afdc9a src/process-unix.c
--- a/src/process-unix.c	Tue May 28 16:07:03 2002 +0000
+++ b/src/process-unix.c	Wed May 29 09:42:49 2002 +0000
@@ -1834,11 +1834,11 @@
   retval = getaddrinfo (ext_host, NULL, &hints, &res);
   if (retval != 0)
     {
-      CIntbyte *gai_error;
+      CIntbyte *gai_err;
 
-      EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error,
+      EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_err,
 			    Qstrerror_encoding);
-      maybe_signal_error (Qio_error, gai_error, host,
+      maybe_signal_error (Qio_error, gai_err, host,
 			  Qprocess, ERROR_ME_DEBUG_WARN);
       canonname = host;
     }
@@ -1930,11 +1930,11 @@
     retval = getaddrinfo (ext_host, portstring, &hints, &res);
     if (retval != 0)
       {
-	CIntbyte *gai_error;
+	CIntbyte *gai_err;
 
-	EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error,
+	EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_err,
 			      Qstrerror_encoding);
-	signal_error (Qio_error, gai_error, list2 (host, service));
+	signal_error (Qio_error, gai_err, list2 (host, service));
       }
 
     /* address loop */