comparison src/process.c @ 44038:e2339254ba48

(conv_sockaddr_to_lisp, conv_lisp_to_sockaddr): Don't use "sun" as a variable, it's a predefined constant on Sun machines.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 20 Mar 2002 18:10:01 +0000
parents da239fc7bb6c
children 134644f94850
comparison
equal deleted inserted replaced
44037:9402752ef1c7 44038:e2339254ba48
1986 break; 1986 break;
1987 } 1987 }
1988 #ifdef HAVE_LOCAL_SOCKETS 1988 #ifdef HAVE_LOCAL_SOCKETS
1989 case AF_LOCAL: 1989 case AF_LOCAL:
1990 { 1990 {
1991 struct sockaddr_un *sun = (struct sockaddr_un *) sa; 1991 struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
1992 for (i = 0; i < sizeof (sun->sun_path); i++) 1992 for (i = 0; i < sizeof (sockun->sun_path); i++)
1993 if (sun->sun_path[i] == 0) 1993 if (sockun->sun_path[i] == 0)
1994 break; 1994 break;
1995 return make_unibyte_string (sun->sun_path, i); 1995 return make_unibyte_string (sockun->sun_path, i);
1996 } 1996 }
1997 #endif 1997 #endif
1998 default: 1998 default:
1999 len -= sizeof (sa->sa_family); 1999 len -= sizeof (sa->sa_family);
2000 address = Fcons (make_number (sa->sa_family), 2000 address = Fcons (make_number (sa->sa_family),
2079 else if (STRINGP (address)) 2079 else if (STRINGP (address))
2080 { 2080 {
2081 #ifdef HAVE_LOCAL_SOCKETS 2081 #ifdef HAVE_LOCAL_SOCKETS
2082 if (family == AF_LOCAL) 2082 if (family == AF_LOCAL)
2083 { 2083 {
2084 struct sockaddr_un *sun = (struct sockaddr_un *) sa; 2084 struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
2085 cp = XSTRING (address)->data; 2085 cp = XSTRING (address)->data;
2086 for (i = 0; i < sizeof (sun->sun_path) && *cp; i++) 2086 for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
2087 sun->sun_path[i] = *cp++; 2087 sockun->sun_path[i] = *cp++;
2088 } 2088 }
2089 #endif 2089 #endif
2090 return; 2090 return;
2091 } 2091 }
2092 else 2092 else