oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

listen: fix namespace collision on OpenSolaris

Browse Source 
The listen.c module breaks the build because the variable name used
("sun") for the Unix domain socket part collides with something else
on an OpenSolaris system, likely Sun specific.  Renaming it to _sun
(or something else of choice) fixes the build.

[mk: renamed to "s_un"]
This commit is contained in:
Tom Servo 2008-11-07 10:33:48 +01:00 committed by Max Kellermann
parent 2e0ba90208
commit ea92576219
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/listen.c
View File

@ -159,19 +159,19 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
#ifdef HAVE_UN
} else if (param->value[0] == '/') {
size_t path_length;
struct sockaddr_un sun;
struct sockaddr_un s_un;
path_length = strlen(param->value);
if (path_length >= sizeof(sun.sun_path))
if (path_length >= sizeof(s_un.sun_path))
FATAL("unix socket path is too long\n");
unlink(param->value);
sun.sun_family = AF_UNIX;
memcpy(sun.sun_path, param->value, path_length + 1);
s_un.sun_family = AF_UNIX;
memcpy(s_un.sun_path, param->value, path_length + 1);
addrp = (const struct sockaddr *)&sun;
addrlen = sizeof(sun);
addrp = (const struct sockaddr *)&s_un;
addrlen = sizeof(s_un);
if (establishListen(PF_UNIX, addrp, addrlen) < 0)
FATAL("unable to bind to %s: %s\n",