diff options
| author | Eli Zaretskii | 2002-03-20 18:10:01 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-03-20 18:10:01 +0000 |
| commit | fb23673a66f4ffaaac96e59414cfd3ce07fd9df4 (patch) | |
| tree | 281188bf5c301f1ea2513c7dbb5e782010026ec9 /src | |
| parent | fae44638c7db6c1414b4a7ef9ad5f32a7ab9d3ca (diff) | |
| download | emacs-fb23673a66f4ffaaac96e59414cfd3ce07fd9df4.tar.gz emacs-fb23673a66f4ffaaac96e59414cfd3ce07fd9df4.zip | |
(conv_sockaddr_to_lisp, conv_lisp_to_sockaddr): Don't
use "sun" as a variable, it's a predefined constant on Sun
machines.
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 14 |
1 files 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) | |||
| 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: |
| @@ -2081,10 +2081,10 @@ conv_lisp_to_sockaddr (family, address, sa, len) | |||
| 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; |