Mercurial > emacs
changeset 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 | 9402752ef1c7 |
| children | 7667ec5e01dd |
| files | src/process.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/process.c Wed Mar 20 17:48:13 2002 +0000 +++ b/src/process.c Wed Mar 20 18:10:01 2002 +0000 @@ -1988,11 +1988,11 @@ #ifdef HAVE_LOCAL_SOCKETS case AF_LOCAL: { - struct sockaddr_un *sun = (struct sockaddr_un *) sa; - for (i = 0; i < sizeof (sun->sun_path); i++) - if (sun->sun_path[i] == 0) + struct sockaddr_un *sockun = (struct sockaddr_un *) sa; + for (i = 0; i < sizeof (sockun->sun_path); i++) + if (sockun->sun_path[i] == 0) break; - return make_unibyte_string (sun->sun_path, i); + return make_unibyte_string (sockun->sun_path, i); } #endif default: @@ -2081,10 +2081,10 @@ #ifdef HAVE_LOCAL_SOCKETS if (family == AF_LOCAL) { - struct sockaddr_un *sun = (struct sockaddr_un *) sa; + struct sockaddr_un *sockun = (struct sockaddr_un *) sa; cp = XSTRING (address)->data; - for (i = 0; i < sizeof (sun->sun_path) && *cp; i++) - sun->sun_path[i] = *cp++; + for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++) + sockun->sun_path[i] = *cp++; } #endif return;