From fb23673a66f4ffaaac96e59414cfd3ce07fd9df4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 20 Mar 2002 18:10:01 +0000 Subject: [PATCH] (conv_sockaddr_to_lisp, conv_lisp_to_sockaddr): Don't use "sun" as a variable, it's a predefined constant on Sun machines. --- src/process.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/process.c b/src/process.c index 8045ffa4067..4483dfa330f 100644 --- a/src/process.c +++ b/src/process.c @@ -1988,11 +1988,11 @@ conv_sockaddr_to_lisp (sa, len) #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 @@ conv_lisp_to_sockaddr (family, address, sa, len) #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; -- 2.39.2