[pulseaudio-commits] r2199 - /trunk/src/utils/padsp.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Apr  1 00:05:10 2008
New Revision: 2199

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2199&root=pulseaudio&view=rev
Log:
merge r2183 from prepare-0.9.10

Modified:
    trunk/src/utils/padsp.c

Modified: trunk/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp.c?rev=2199&root=pulseaudio&r1=2198&r2=2199&view=diff
==============================================================================
--- trunk/src/utils/padsp.c (original)
+++ trunk/src/utils/padsp.c Tue Apr  1 00:05:10 2008
@@ -2307,7 +2307,11 @@
     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;