merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions

View file

@ -149,14 +149,14 @@ int pipe(int filedes[2]) {
return 0;
error:
if (listener >= 0)
pa_close(listener);
if (filedes[0] >= 0)
pa_close(filedes[0]);
if (filedes[1] >= 0)
pa_close(filedes[0]);
if (listener >= 0)
pa_close(listener);
if (filedes[0] >= 0)
pa_close(filedes[0]);
if (filedes[1] >= 0)
pa_close(filedes[0]);
return -1;
return -1;
}
#endif /* HAVE_PIPE */