merge r2183 from prepare-0.9.10

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2199 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-31 22:05:10 +00:00
parent 1be481f481
commit e382f2233f

View file

@ -2307,7 +2307,11 @@ fail:
return ret;
}
#ifdef sun
int ioctl(int fd, int request, ...) {
#else
int ioctl(int fd, unsigned long request, ...) {
#endif
fd_info *i;
va_list args;
void *argp;